From ad858a57eb4a779dec58c85ec2db3ca56aa0890d Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Fri, 9 Sep 2016 16:13:57 +0900 Subject: [PATCH] Remove unnecessary macro Change-Id: Ic67d98795b3c3329de7fd1697f216f9a670853df Signed-off-by: Hwankyu Jhun --- CMakeLists.txt | 6 +----- packaging/debug-launchpad.spec | 7 ------- src/common.c | 6 ------ 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f68928..6d53dce 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,11 +19,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") # Set required packages INCLUDE(FindPkgConfig) -SET(pkgs_requires "dlog glib-2.0 gio-2.0 bundle vconf security-manager") -IF(_APPFW_FEATURE_SOCKET_ACTIVATION) - SET(pkgs_requires "${pkgs_requires} libsystemd-daemon") - ADD_DEFINITIONS("-D_APPFW_FEATURE_SOCKET_ACTIVATION") -ENDIF(_APPFW_FEATURE_SOCKET_ACTIVATION) +SET(pkgs_requires "dlog glib-2.0 gio-2.0 bundle vconf security-manager libsystemd-daemon") pkg_check_modules(pkgs REQUIRED ${pkgs_requires}) diff --git a/packaging/debug-launchpad.spec b/packaging/debug-launchpad.spec index 491df68..6300e02 100755 --- a/packaging/debug-launchpad.spec +++ b/packaging/debug-launchpad.spec @@ -24,8 +24,6 @@ BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(security-manager) BuildRequires: pkgconfig(libsystemd-daemon) -%define appfw_feature_socket_activation 1 - %description Debug launchpad @@ -38,7 +36,6 @@ _APPFW_FEATURE_SOCKET_ACTIVATION=ON %endif cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -D_APPFW_FEATURE_SOCKET_ACTIVATION:BOOL=${_APPFW_FEATURE_SOCKET_ACTIVATION} \ . make %{?jobs:-j%jobs} @@ -47,12 +44,10 @@ make %{?jobs:-j%jobs} rm -rf %{buildroot} %make_install -%if 0%{?appfw_feature_socket_activation} mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir_user}/debug-launchpad.service install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir_user}/debug-launchpad.socket ln -s ../debug-launchpad.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/debug-launchpad.socket -%endif %clean rm -rf %{buildroot} @@ -63,8 +58,6 @@ rm -rf %{buildroot} %license LICENSE %manifest debug-launchpad.manifest %caps(cap_mac_admin,cap_setgid,cap_dac_override=ei) %{_bindir}/debug_launchpad_preloading_preinitializing_daemon -%if 0%{?appfw_feature_socket_activation} %{_unitdir_user}/debug-launchpad.service %{_unitdir_user}/debug-launchpad.socket %{_unitdir_user}/sockets.target.wants/debug-launchpad.socket -%endif diff --git a/src/common.c b/src/common.c index c6b121a..b64ea5f 100644 --- a/src/common.c +++ b/src/common.c @@ -31,9 +31,7 @@ #include #include #include -#ifdef _APPFW_FEATURE_SOCKET_ACTIVATION #include -#endif /* _APPFW_FEATURE_SOCKET_ACTIVATION */ #include "common.h" #include "debug_util.h" @@ -57,7 +55,6 @@ static void __set_sock_option(int fd, int cli) setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); } -#ifdef _APPFW_FEATURE_SOCKET_ACTIVATION static int __create_sock_activation(void) { int listen_fds; @@ -72,7 +69,6 @@ static int __create_sock_activation(void) return -1; } -#endif /* _APPFW_FEATURE_SOCKET_ACTIVATION */ static int __create_server_socket(bool is_app) { @@ -159,9 +155,7 @@ int _create_server_sock(void) { int fd = -1; -#ifdef _APPFW_FEATURE_SOCKET_ACTIVATION fd = __create_sock_activation(); -#endif /* _APPFW_FEATURE_SOCKET_ACTIAVTION */ if (fd < 0) { fd = __create_server_socket(false); if (fd < 0) { -- 2.7.4