Upgrade bluez5_37 :Merge the code from private

[platform/upstream/bluez.git] / obexd / src / main.c

diff --git a/obexd/src/main.c b/obexd/src/main.c
old mode 100644 (file)
new mode 100755 (executable)
index 515405c..00644c9
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -44,14 +44,12 @@
 
 #include "gdbus/gdbus.h"
 
+#include "../client/manager.h"
+
 #include "log.h"
 #include "obexd.h"
 #include "server.h"
 
-#ifdef __TIZEN_PATCH__
-#include "../client/manager.h"
-#endif
-
 #define DEFAULT_CAP_FILE CONFIGDIR "/capability.xml"
 
 static GMainLoop *main_loop = NULL;