Modify missed build option naming rules

Change-Id: Iea52cdd32c146dc2b8146d97b5a8e6bd3b009c48
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/Makefile.plugins b/Makefile.plugins
index 4a1e054..178eb31 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -15,7 +15,7 @@ endif
 builtin_modules += policy
 builtin_sources += plugins/policy.c
 
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 builtin_modules += dbusoob
 builtin_sources += plugins/dbusoob.c \
                        src/oob.h src/oob.c

diff --git a/configure.ac b/configure.ac
index f337c64..b199715 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -238,7 +238,7 @@ AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
                                        [enable_experimental=${enableval}])
 AM_CONDITIONAL(EXPERIMENTAL, test "${enable_experimental}" = "yes")
 
-# Start of __TIZEN_PATCH__
+# Start of TIZEN_FEATURE_BLUEZ_MODIFY
 AC_ARG_ENABLE(wearable, AC_HELP_STRING([--enable-wearable],
                        [enable wearable profile]), [enable_wearable=${enableval}])
 AM_CONDITIONAL(WEARABLE, test "${enable_wearable}" = "yes")
@@ -265,8 +265,7 @@ AC_ARG_ENABLE(sap, AC_HELP_STRING([--enable-sap],
                        [Enable SAP Plugin]), [enable_sap=${enableval}])
 AM_CONDITIONAL(TIZEN_SAP_PLUGIN, test "${enable_sap}" = "yes")
 
-# End of __TIZEN_PATCH__
-
+# End of TIZEN_FEATURE_BLUEZ_MODIFY
 AC_ARG_ENABLE(sixaxis, AC_HELP_STRING([--enable-sixaxis],
                [enable sixaxis plugin]), [enable_sixaxis=${enableval}])
 AM_CONDITIONAL(SIXAXIS, test "${enable_sixaxis}" = "yes" &&

diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
index 8d5aecd..88da134 100644 (file)
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -170,7 +170,7 @@ int ftp_chkput(struct obex_session *os, void *user_data)
 {
        struct ftp_session *ftp = user_data;
        const char *name = obex_get_name(os);
-#ifdef TIZEN_PATCH
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
        char *folder;
        int32_t time;
        int err;
@@ -189,7 +189,7 @@ int ftp_chkput(struct obex_session *os, void *user_data)
        if (obex_get_size(os) == OBJECT_SIZE_DELETE)
                return 0;
 
-#ifdef TIZEN_PATCH
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
        time = 0;
        err = manager_request_authorization(os, time, &folder, &name);
        if (err < 0)
@@ -231,7 +231,7 @@ int ftp_put(struct obex_session *os, void *user_data)
        return 0;
 }
 
-#ifdef TIZEN_PATCH
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 static gboolean is_valid_name(const char *name)
 {
        char *forbid_chars = "[*\"<>;?|\\^:/]";
@@ -313,7 +313,7 @@ int ftp_setpath(struct obex_session *os, void *user_data)
                return -EPERM;
        }
 
-#ifdef TIZEN_PATCH
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
        /* Check if the folder name is valid or not */
        if (!is_valid_name(name)) {
                error("Set path failed: Invalid folder name!");

diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index 76031e5..0949b6a 100644 (file)
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -249,7 +249,7 @@ static void query_result(const char *buffer, size_t bufsize, int vcards,
        if (missed > 0) {
 #else
        if (pbap->params->required_missedcall_call_header == TRUE) {
-#endif /* _TIZEN_PATCH__ */
+#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */
                DBG("missed %d", missed);
 
                pbap->obj->firstpacket = TRUE;

diff --git a/src/main_hive.conf b/src/main_hive.conf
index 4d5066d..f521092 100644 (file)
--- a/src/main_hive.conf
+++ b/src/main_hive.conf
@@ -8,7 +8,7 @@
 
 # Default device class. Only the major and minor device class bits are
 # considered. Defaults to '0x000000'.
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 Class = 0x40414                # HIVE
 #else
 #Class = 0x000100
@@ -70,7 +70,7 @@ Class = 0x40414               # HIVE
 # 'false'.
 #FastConnectable = false
 
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 # Enable the LE Privacy feature. If value is true, i.e. LE Privacy is enabled
 # otherwise the feature is disabled by default for the local device.
 EnableLEPrivacy = true

diff --git a/src/main_m.conf b/src/main_m.conf
index c748ed7..bb431e4 100644 (file)
--- a/src/main_m.conf
+++ b/src/main_m.conf
@@ -8,7 +8,7 @@
 
 # Default device class. Only the major and minor device class bits are
 # considered. Defaults to '0x000000'.
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 Class = 0x00020C        # Smart phone
 #else
 #Class = 0x000100
@@ -70,7 +70,7 @@ Class = 0x00020C        # Smart phone
 # 'false'.
 #FastConnectable = false
 
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 # Enable the LE Privacy feature. If value is true, i.e. LE Privacy is enabled
 # otherwise the feature is disabled by default for the local device.
 EnableLEPrivacy = false

diff --git a/src/main_w.conf b/src/main_w.conf
index 2709355..822be5e 100644 (file)
--- a/src/main_w.conf
+++ b/src/main_w.conf
@@ -8,7 +8,7 @@
 
 # Default device class. Only the major and minor device class bits are
 # considered. Defaults to '0x000000'.
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 Class = 0x000704        # Wearable, Wrist Watch
 #else
 #Class = 0x000100
@@ -63,7 +63,7 @@ Class = 0x000704        # Wearable, Wrist Watch
 # 'false'.
 #FastConnectable = false
 
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 # Enable the LE Privacy feature. If value is true, i.e. LE Privacy is enabled
 # otherwise the feature is disabled by default for the local device.
 EnableLEPrivacy = false
@@ -76,7 +76,7 @@ EnableLEPrivacy = false
 # timeout). The policy plugin should contain a sane set of values by
 # default, but this list can be overridden here. By setting the list to
 # empty the reconnection feature gets disabled.
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 ReconnectUUIDs=
 #else
 #ReconnectUUIDs=