From: Erich Keane <erich.keane@intel.com>
Date: Tue, 21 Jul 2015 16:06:28 +0000 (-0700)
Subject: prefer the other version
X-Git-Tag: 1.2.0+RC1~1419
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95947376f26b8dc28c0807ea355b19101c5b150b;p=platform%2Fupstream%2Fiotivity.git

prefer the other version
Revert "csdk: Fix build issues related to conversions on Linux"

This reverts commit 9604ac4ece381c26b7478e97f1ee8a604bc50d6c.

Change-Id: I4704d20a0a091920842dc33056eb238a0a3789d8
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1791
---

diff --git a/resource/csdk/stack/include/internal/ocresource.h b/resource/csdk/stack/include/internal/ocresource.h
index 517e7bc..c868035 100644
--- a/resource/csdk/stack/include/internal/ocresource.h
+++ b/resource/csdk/stack/include/internal/ocresource.h
@@ -187,7 +187,7 @@ typedef struct resourceinterface_t {
 /**
  * Data structure for holding data type and definition for OIC resource.
  */
-typedef struct rsrc_t {
+typedef struct OCResource {
 
     /** Points to next resource in list.*/
     struct rsrc_t *next;
diff --git a/resource/csdk/stack/include/ocpayload.h b/resource/csdk/stack/include/ocpayload.h
index d34dc5e..91776c4 100644
--- a/resource/csdk/stack/include/ocpayload.h
+++ b/resource/csdk/stack/include/ocpayload.h
@@ -31,7 +31,7 @@ extern "C"
 {
 #endif
 
-typedef struct rsrc_t OCResource;
+typedef struct OCResource OCResource;
 
 #ifdef TB_LOG
     #define OC_LOG_PAYLOAD(level, tag, payload) OCPayloadLog((level),(tag),(payload))