csdk: Fix build issues related to OCResource conversions on Linux
authorRavi Nanjundappa <nravi.n@samsung.com>
Tue, 21 Jul 2015 13:33:07 +0000 (19:03 +0530)
committerErich Keane <erich.keane@intel.com>
Tue, 21 Jul 2015 16:08:17 +0000 (16:08 +0000)
This fixes OCResource conversion issues to/from rsrc_t

Change-Id: I04c197446df9311c2617f0035e469058ff81e81e
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
resource/csdk/stack/include/internal/ocresource.h

index c868035..0a30750 100644 (file)
@@ -190,7 +190,7 @@ typedef struct resourceinterface_t {
 typedef struct OCResource {
 
     /** Points to next resource in list.*/
-    struct rsrc_t *next;
+    struct OCResource *next;
 
     /** Relative path on the device; will be combined with base url to create fully qualified path.*/
     char *uri;
@@ -207,7 +207,7 @@ typedef struct OCResource {
     /** Array of pointers to resources; can be used to represent a container of resources.
      * (i.e. hierarchies of resources) or for reference resources (i.e. for a resource collection).*/
 
-    struct rsrc_t *rsrcResources[MAX_CONTAINED_RESOURCES];
+    struct OCResource *rsrcResources[MAX_CONTAINED_RESOURCES];
 
     /** Pointer to function that handles the entity bound to the resource.
      *  This handler has to be explicitly defined by the programmer.*/