Build fix for tizen when TARGET_TRANSPORT=BLE 94/221594/1
authorsamanway <samanway@linux-samanway.sa.corp.samsungelectronics.net>
Fri, 22 Nov 2019 10:15:47 +0000 (15:45 +0530)
committerSudipto Bal <sudipto.bal@samsung.com>
Mon, 6 Jan 2020 05:41:30 +0000 (05:41 +0000)
- Commit 63d798167fd9695cb278bc3c228864163dde5292 in IoTivity 1.2-rel branch added 3 APIs which should build only for TCP adapter
- For this reason BLE build was being failed
- Corrected that with adding Flag

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/d2fd37d35129acf337d6895e2efe84c7331bbd3d
(cherry-picked from d2fd37d35129acf337d6895e2efe84c7331bbd3d)

Change-Id: Id34ae9edc4f5123932584151a8ac8f54432c1292
Signed-off-by: samanway-dey <samanway.dey@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>
resource/csdk/connectivity/api/cautilinterface.h
resource/csdk/connectivity/util/src/cautilinterface.c

index 59e0315..d11105a 100755 (executable)
@@ -452,6 +452,7 @@ CAResult_t CAUtilStopGattServer();
 #if defined(__TIZEN__)
 CAResult_t CAGetTCPIPHeader(CATransportAdapter_t adapter, int flag, TCPHeaderInfo* info);
 
+#ifdef TCP_ADAPTER
 /**
  * Enables keep-alive on the given endpoint & configures it with user defined values.
  *
@@ -482,6 +483,7 @@ CAResult_t CAUnSetTCPKeepAlive(const CAEndpoint_t *endpoint);
  * @return             - Direct 'errno' value from kernel
  */
 int CAGetTCPLastErrorCode();
+#endif
 
 /**
  * Set the interface to be used for outgoing TCP packets.
index c8a11bb..c0c9bf7 100644 (file)
@@ -551,6 +551,7 @@ CAResult_t CAGetTCPIPHeader(CATransportAdapter_t adapter, int flag, TCPHeaderInf
     return res;
 }
 
+#ifdef TCP_ADAPTER
 CAResult_t CASetTCPKeepAlive(const CAEndpoint_t *endpoint, int time, int cnt, int intvl)
 {
     OIC_LOG(DEBUG, TAG, "CASetTCPKeepAlive");
@@ -568,5 +569,5 @@ int CAGetTCPLastErrorCode()
     OIC_LOG(DEBUG, TAG, "CAGetTCPLastErrorCode");
     return CATCPGetLastErrorCode();
 }
-
+#endif
 #endif