diff options
| author | Ossama Othman <ossama.othman@intel.com> | 2014-09-11 09:43:53 -0700 |
|---|---|---|
| committer | Ossama Othman <ossama.othman@intel.com> | 2014-09-12 09:50:15 -0700 |
| commit | beb6fd3ce23070bc9bd705e468d7eee611432b65 (patch) | |
| tree | 7a60d5d83b5f3ed845c8efa064f1c5c957973e9a | |
| parent | f2cf9d8bbbbd3eec106c66c99f9b0920d0875602 (diff) | |
| download | persistence-common-object-tizen.tar.gz persistence-common-object-tizen.tar.bz2 persistence-common-object-tizen.zip | |
Avoid conflicts with standard integer typedefs.HEADtizen_3.0_ivi_releasetizen_3.0.m14.3_ivi_releasesubmit/tizen_ivi/20140912.867530submit/devel/ivi/20160127.022320accepted/tizen/ivi/20140915.163328tizen_3.0_ivitizen_3.0.m14.3_ivitizendevel/iviaccepted/tizen_iviaccepted/tizen_3.0_iviaccepted/tizen_3.0.m14.3_ivi
Change-Id: Ibad76c44131a48d9e860229bb1007c6f89a8c089
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
| -rw-r--r-- | inc/protected/persComTypes.h | 6 | ||||
| -rw-r--r-- | packaging/persistence-common-object.changes | 3 |
2 files changed, 9 insertions, 0 deletions
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 <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 --- 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. |