From: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Date: Tue, 21 Jul 2015 16:02:06 +0000 (-0700)
Subject: Fix redefinition types in octype
X-Git-Tag: 1.2.0+RC1~1417
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e74be30db361b8418c994aa35133b1194a6a64a9;p=platform%2Fupstream%2Fiotivity.git

Fix redefinition types in octype

Remove duplicate definition in octype header.

Change-Id: If99021458bc16ae6aa645f7946bd047baa565b67
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1786
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
---

diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h
index 5113a9a..b9f4f83 100644
--- a/resource/csdk/stack/include/octypes.h
+++ b/resource/csdk/stack/include/octypes.h
@@ -261,16 +261,12 @@ extern "C" {
 #define OC_MULTICAST_PORT                    5683
 #endif // GOING_AWAY
 
+/** Max Device address size. */
 #ifdef RA_ADAPTER
 #define MAX_ADDR_STR_SIZE (256)
 #else
 #define MAX_ADDR_STR_SIZE (40)
- #endif
-
-#define MAX_IDENTITY_SIZE (32)
-
-/** Max Device address size. */
-#define MAX_ADDR_STR_SIZE (40)
+#endif
 
 /** Max identity size. */
 #define MAX_IDENTITY_SIZE (32)