From beb6fd3ce23070bc9bd705e468d7eee611432b65 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Thu, 11 Sep 2014 09:43:53 -0700 Subject: [PATCH] Avoid conflicts with standard integer typedefs. Change-Id: Ibad76c44131a48d9e860229bb1007c6f89a8c089 Signed-off-by: Ossama Othman --- inc/protected/persComTypes.h | 6 ++++++ packaging/persistence-common-object.changes | 3 +++ 2 files changed, 9 insertions(+) diff --git a/inc/protected/persComTypes.h b/inc/protected/persComTypes.h index 4fc0ff7..df56ac9 100644 --- a/inc/protected/persComTypes.h +++ b/inc/protected/persComTypes.h @@ -23,6 +23,10 @@ #include +#ifdef _ISOC99_SOURCE +#include +#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 --- a/packaging/persistence-common-object.changes +++ b/packaging/persistence-common-object.changes @@ -1,3 +1,6 @@ +* Fri Sep 12 2014 Ossama Othman submit/tizen_ivi/20140912.678321-0-g9d163d6 +- Avoid conflicts with standard integer typedefs. + * Thu Sep 04 2014 Ossama Othman 18e4bae - Initial packaging. -- 2.7.4