From: samanway Date: Fri, 22 Nov 2019 10:15:47 +0000 (+0530) Subject: Build fix for tizen when TARGET_TRANSPORT=BLE X-Git-Tag: submit/tizen/20200121.084836~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6cc141724c6b3f53fcf524cb76811a9dd2a861b1;p=platform%2Fupstream%2Fiotivity.git Build fix for tizen when TARGET_TRANSPORT=BLE - 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 Signed-off-by: Sudipto --- diff --git a/resource/csdk/connectivity/api/cautilinterface.h b/resource/csdk/connectivity/api/cautilinterface.h index 59e03154d..d11105afa 100755 --- a/resource/csdk/connectivity/api/cautilinterface.h +++ b/resource/csdk/connectivity/api/cautilinterface.h @@ -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. diff --git a/resource/csdk/connectivity/util/src/cautilinterface.c b/resource/csdk/connectivity/util/src/cautilinterface.c index c8a11bbcd..c0c9bf75c 100644 --- a/resource/csdk/connectivity/util/src/cautilinterface.c +++ b/resource/csdk/connectivity/util/src/cautilinterface.c @@ -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