fix build errors

The value of jboolean should be 'JNI_TRUE' or 'JNI_FALSE'
The value of bool should be 'true' or 'false'

Signed-off-by: Caiwen Zhang <caiwen.zhang@intel.com>
Change-Id: I6ad62b25abe32c67dc3d8335c1836d3338631b12
Reviewed-on: https://gerrit.iotivity.org/gerrit/871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/csdk/connectivity/lib/libcoap-4.1.1/debug.c b/resource/csdk/connectivity/lib/libcoap-4.1.1/debug.c
index 4afe4f9..df9ae7b 100644 (file)
--- a/resource/csdk/connectivity/lib/libcoap-4.1.1/debug.c
+++ b/resource/csdk/connectivity/lib/libcoap-4.1.1/debug.c
@@ -148,7 +148,11 @@ size_t coap_print_addr(const struct coap_address_t *addr, unsigned char *buf, si
 {
 #ifdef HAVE_ARPA_INET_H
     const void *addrptr = NULL;
+#if defined(__ANDROID__)
+    __uint16_t port;
+#else
     in_port_t port;
+#endif
     unsigned char *p = buf;
 
     switch (addr->addr.sa.sa_family)

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
index 6cda98d..fae5659 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
@@ -547,7 +547,7 @@ CAResult_t CAEDRSendUnicastMessageImpl(const char* address, const char* data,
             OIC_LOG(DEBUG, TAG, "AttachCurrentThread failed");
             return CA_STATUS_INVALID_PARAM;
         }
-        isAttached = TRUE;
+        isAttached = JNI_TRUE;
     }
 
     OIC_LOG(DEBUG, TAG, "[EDR][Native] set byteArray for data");

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
index 0c07512..9c3875f 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
@@ -246,9 +246,9 @@ CAResult_t CAEDRServerStop(int serverFD)
     CAEDRStopUnicastServer(-1);
     CAEDRStopMulticastServer(-1);
 
-    g_stopAccept = TRUE;
-    g_stopMulticast = TRUE;
-    g_stopUnicast = TRUE;
+    g_stopAccept = true;
+    g_stopMulticast = true;
+    g_stopUnicast = true;
 
     OIC_LOG(DEBUG, TAG, "OUT");
     return CA_STATUS_OK;

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c
index f779440..4f96d2b 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c
@@ -226,7 +226,7 @@ jboolean CAEDRNativeIsEnableBTAdapter(JNIEnv *env)
     if(!jni_cid_BTAdapter)
     {
         OIC_LOG(ERROR, TAG, "[EDR][Native] jni_cid_BTAdapter: jni_cid_BTAdapter is null");
-        return FALSE;
+        return JNI_FALSE;
     }
 
     jmethodID jni_mid_getDefaultAdapter = (*env)->GetStaticMethodID(env,
@@ -234,7 +234,7 @@ jboolean CAEDRNativeIsEnableBTAdapter(JNIEnv *env)
     if(!jni_mid_getDefaultAdapter)
     {
         OIC_LOG(ERROR, TAG, "[EDR][Native] jni_mid_getDefaultAdapter is null");
-        return FALSE;
+        return JNI_FALSE;
     }
 
     jobject jni_obj_BTAdapter = (*env)->CallStaticObjectMethod(env,
@@ -242,7 +242,7 @@ jboolean CAEDRNativeIsEnableBTAdapter(JNIEnv *env)
     if(!jni_obj_BTAdapter)
     {
         OIC_LOG(ERROR, TAG, "[EDR][Native] jni_obj_BTAdapter is null");
-        return FALSE;
+        return JNI_FALSE;
     }
 
     // isEnable()
@@ -251,7 +251,7 @@ jboolean CAEDRNativeIsEnableBTAdapter(JNIEnv *env)
     if(!jni_mid_isEnable)
     {
         OIC_LOG(ERROR, TAG, "[EDR][Native] jni_mid_isEnable is null");
-        return FALSE;
+        return JNI_FALSE;
     }
 
     jboolean jni_isEnable = (*env)->CallBooleanMethod(env, jni_obj_BTAdapter, jni_mid_isEnable);

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
index e4b8d64..4e23a99 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
@@ -235,8 +235,8 @@ void CALETerminate()
 
     CANativeRemoveAllDevices(env);
     CANativeRemoveAllGattObjsList(env);
-    g_isStartServer = FALSE;
-    g_isFinishSendData = FALSE;
+    g_isStartServer = JNI_FALSE;
+    g_isFinishSendData = JNI_FALSE;
 
     if (isAttached)
     {
@@ -442,7 +442,7 @@ CAResult_t CALESendUnicastMessageImpl(const char* address, const char* data, con
 
         if (jni_obj_bluetoothDevice)
         {
-            jboolean autoConnect = FALSE;
+            jboolean autoConnect = JNI_FALSE;
             CANativeLEConnect(env, jni_obj_bluetoothDevice, g_context, autoConnect,
                               g_leGattCallback);
         }
@@ -621,7 +621,7 @@ void CANativeLEStartScan()
         return;
     }
 
-    jboolean isAttached = FALSE;
+    jboolean isAttached = JNI_FALSE;
     JNIEnv* env;
     jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
     if (res != JNI_OK)
@@ -634,7 +634,7 @@ void CANativeLEStartScan()
             OIC_LOG(ERROR, TAG, "AttachCurrentThread failed");
             return;
         }
-        isAttached = TRUE;
+        isAttached = JNI_TRUE;
     }
 
     OIC_LOG(DEBUG, TAG, "[BLE][Native] CANativeLEStartScan");
@@ -808,7 +808,7 @@ void CANativeLEStartScanWithUUIDImpl(JNIEnv *env, jobjectArray uuids, jobject ca
 
 void CANativeLEStopScan()
 {
-    jboolean isAttached = FALSE;
+    jboolean isAttached = JNI_FALSE;
     JNIEnv* env;
     jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
     if (res != JNI_OK)
@@ -820,7 +820,7 @@ void CANativeLEStopScan()
             OIC_LOG(ERROR, TAG, "AttachCurrentThread failed");
             return;
         }
-        isAttached = TRUE;
+        isAttached = JNI_TRUE;
     }
 
     CANativeLEStopScanImpl(env, g_leScanCallback);
@@ -1166,7 +1166,7 @@ CAResult_t CANativeSetCharacteristicNotification(JNIEnv *env, jobject bluetoothG
         return CA_STATUS_FAILED;
     }
 
-    jboolean enable = TRUE;
+    jboolean enable = JNI_TRUE;
     jboolean ret = (*env)->CallBooleanMethod(env, bluetoothGatt, jni_mid_setNotification,
                                              jni_obj_GattCharacteristic, enable);
     if (1 == ret)
@@ -1333,7 +1333,7 @@ jbyteArray CANativeGetValueFromCharacteristic(JNIEnv *env, jobject characteristi
 
 void CANativeCreateUUIDList()
 {
-    jboolean isAttached = FALSE;
+    jboolean isAttached = JNI_FALSE;
     JNIEnv* env;
     jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
     if (res != JNI_OK)
@@ -1346,7 +1346,7 @@ void CANativeCreateUUIDList()
             OIC_LOG(ERROR, TAG, "AttachCurrentThread failed");
             return;
         }
-        isAttached = TRUE;
+        isAttached = JNI_TRUE;
     }
 
     // create new object array
@@ -1436,14 +1436,14 @@ jboolean CANativeIsDeviceInList(JNIEnv *env, const char* remoteAddress)
         if (!jarrayObj)
         {
             OIC_LOG(ERROR, TAG, "[BLE][Native] jarrayObj is null");
-            return TRUE;
+            return JNI_TRUE;
         }
 
         jstring jni_setAddress = CALEGetAddressFromBTDevice(env, jarrayObj);
         if (!jni_setAddress)
         {
             OIC_LOG(ERROR, TAG, "[BLE][Native] jni_setAddress is null");
-            return TRUE;
+            return JNI_TRUE;
         }
 
         const char* setAddress = (*env)->GetStringUTFChars(env, jni_setAddress, NULL);
@@ -1451,12 +1451,12 @@ jboolean CANativeIsDeviceInList(JNIEnv *env, const char* remoteAddress)
         if (!strcmp(remoteAddress, setAddress))
         {
             OIC_LOG(DEBUG, TAG, "the device is already set");
-            return TRUE;
+            return JNI_TRUE;
         }
     }
 
     OIC_LOG(DEBUG, TAG, "there are no the device in list. we can add");
-    return FALSE;
+    return JNI_FALSE;
 }
 
 void CANativeRemoveAllDevices(JNIEnv *env)
@@ -1605,14 +1605,14 @@ jboolean CANativeIsGattObjInList(JNIEnv *env, const char* remoteAddress)
         if (!jarrayObj)
         {
             OIC_LOG(ERROR, TAG, "[BLE][Native] jarrayObj is null");
-            return TRUE;
+            return JNI_TRUE;
         }
 
         jstring jni_setAddress = CANativeGetAddressFromGattObj(env, jarrayObj);
         if (!jni_setAddress)
         {
             OIC_LOG(ERROR, TAG, "[BLE][Native] jni_setAddress is null");
-            return TRUE;
+            return JNI_TRUE;
         }
 
         const char* setAddress = (*env)->GetStringUTFChars(env, jni_setAddress, NULL);
@@ -1620,7 +1620,7 @@ jboolean CANativeIsGattObjInList(JNIEnv *env, const char* remoteAddress)
         if (!strcmp(remoteAddress, setAddress))
         {
             OIC_LOG(DEBUG, TAG, "the device is already set");
-            return TRUE;
+            return JNI_TRUE;
         }
         else
         {
@@ -1629,7 +1629,7 @@ jboolean CANativeIsGattObjInList(JNIEnv *env, const char* remoteAddress)
     }
 
     OIC_LOG(DEBUG, TAG, "there are no the gatt obejct in list. we can add");
-    return FALSE;
+    return JNI_FALSE;
 }
 
 void CANativeRemoveAllGattObjsList(JNIEnv *env)
@@ -1746,7 +1746,7 @@ void CANativeupdateSendCnt(JNIEnv *env)
         }
         // notity the thread
         ca_cond_signal(g_threadCond);
-        g_isFinishSendData = TRUE;
+        g_isFinishSendData = JNI_TRUE;
         OIC_LOG(DEBUG, TAG, "set signal for send data");
     }
     // mutex unlock

diff --git a/resource/include/OCRepresentation.h b/resource/include/OCRepresentation.h
index 2ef52a7..97d8924 100644 (file)
--- a/resource/include/OCRepresentation.h
+++ b/resource/include/OCRepresentation.h
@@ -42,9 +42,6 @@
 #endif
 
 #include <OCException.h>
-#ifdef __ANDROID__
-#include "android_cpp11_compat.h"
-#endif
 
 namespace cereal
 {