Avoid conflicts with standard integer typedefs.

Change-Id: Ibad76c44131a48d9e860229bb1007c6f89a8c089
Signed-off-by: Ossama Othman <ossama.othman@intel.com>

diff --git a/inc/protected/persComTypes.h b/inc/protected/persComTypes.h
index 4fc0ff7..df56ac9 100644 (file)
--- a/inc/protected/persComTypes.h
+++ b/inc/protected/persComTypes.h
@@ -23,6 +23,10 @@
 
 #include <stdbool.h>
 
+#ifdef _ISOC99_SOURCE
+#include <stdint.h>
+#endif
+
 #ifndef char_t
 typedef char char_t ;
 #endif
@@ -74,10 +78,12 @@ typedef __s16 INT16;
 typedef __s32 INT32;
 typedef __s64 INT64;
 
+#ifndef _ISOC99_SOURCE
 typedef __u8  uint8_t;
 typedef __u16 uint16_t;
 typedef __u32 uint32_t;
 typedef __u64 uint64_t;
+#endif
 
 /**
  * \brief 8 bit signed

diff --git a/packaging/persistence-common-object.changes b/packaging/persistence-common-object.changes
index ea562b2..f7edadc 100644 (file)
--- a/packaging/persistence-common-object.changes
+++ b/packaging/persistence-common-object.changes
@@ -1,3 +1,6 @@
+* Fri Sep 12 2014 Ossama Othman <ossama.othman@intel.com> submit/tizen_ivi/20140912.678321-0-g9d163d6
+- Avoid conflicts with standard integer typedefs.
+
 * Thu Sep 04 2014 Ossama Othman <ossama.othman@intel.com> 18e4bae
 - Initial packaging.