Cleanup defines

Fix build - do not redefine CLIENT_SOCKET, remove unused defines.

Change-Id: I916813c557790a7a116e590f981aaf45aa49a5cb
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 886e1e6..fa32468 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,10 +77,7 @@ ADD_DEFINITIONS("-DNDEBUG")
 ADD_DEFINITIONS("-D_USE_ECORE_TIME_GET")
 #ADD_DEFINITIONS("-DFLOG")
 ADD_DEFINITIONS("-DMASTER_PKGNAME=\"data-provider-master\"")
-ADD_DEFINITIONS("-DINFO_SOCKET=\"/opt/usr/share/live_magazine/.live.socket\"")
-ADD_DEFINITIONS("-DCLIENT_SOCKET=\"/opt/usr/share/live_magazine/.client.socket\"")
-ADD_DEFINITIONS("-DSLAVE_SOCKET=\"/opt/usr/share/live_magazine/.slave.socket\"")
-ADD_DEFINITIONS("-DSERVICE_SOCKET=\"/opt/usr/share/live_magazine/.service.socket\"")
+ADD_DEFINITIONS("-DCLIENT_SOCKET=tzplatform_mkpath(TZ_USER_SHARE,\"live_magazine/.client.socket\")")
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${BUILD_SOURCE})
 
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})

diff --git a/src/client.c b/src/client.c
index fe8f6b6..903453e 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -47,8 +47,6 @@
 #include "dlist.h"
 #include <tzplatform_config.h>
 
-#define CLIENT_SOCKET tzplatform_mkpath(TZ_USER_SHARE,"live_magazine/.client.socket")
-
 int errno;
 
 static struct info {