Relocate rd-mode-dependent functions in .def files 05/21505/8
authorGabriel Schulhof <gabriel.schulhof@intel.com>
Tue, 11 Jul 2017 20:52:25 +0000 (23:52 +0300)
committerDan Mihai <Daniel.Mihai@microsoft.com>
Fri, 20 Oct 2017 00:25:09 +0000 (00:25 +0000)
OCBindResourceInsToResource and OCGetResourceIns are only defined if
RD_MODE is either "client" or "server", but not if it is "none". Thus,
octbstack_product.def must not include those functions.

Bug: https://jira.iotivity.org/browse/IOT-2500
Change-Id: I88bbf033006e82d1655d39d7f3127a1e40a1d4e7
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21395
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit f4fb7430a9b9a6601b80634d96b8a08fed42802b)

resource/csdk/stack/octbstack_product.def
resource/csdk/stack/octbstack_rd_client.def
resource/csdk/stack/octbstack_rd_server.def

index 0d73f32..56021c5 100644 (file)
@@ -14,7 +14,6 @@ convertTriggerEnumToString
 FindResourceByUri
 OCBindResource
 OCBindResourceHandler
-OCBindResourceInsToResource
 OCBindResourceInterfaceToResource
 OCBindResourceTypeToResource
 OCByteStringCopy
@@ -62,7 +61,6 @@ OCGetResourceInterfaceName
 OCGetResourceProperties
 OCGetResourceTypeName
 OCGetResourceUri
-OCGetResourceIns
 OCGetServerInstanceIDString
 OCGetSupportedEndpointTpsFlags
 OCInit
index 0e322c9..5534a29 100644 (file)
@@ -1,5 +1,7 @@
 ; APIs used when RD_MODE includes CLIENT
 
+OCBindResourceInsToResource
+OCGetResourceIns
 OCRDDelete
 OCRDDeleteWithDeviceId
 OCRDDiscover
index 8cdba70..c679c95 100644 (file)
@@ -1,5 +1,7 @@
 ; APIs used when RD_MODE includes SERVER
 
+OCBindResourceInsToResource
+OCGetResourceIns
 OCRDDatabaseInit
 OCRDDatabaseClose
 OCRDDatabaseDeleteResources