PCO Vers. 1.0.2 - Updated protected IF persComTypes.h :

Allow support of the standard C99 instead of redeclaration. Change-Id: Ie62e2c6466fc73c2d054c115627a2387db3eb964 Signed-off-by: Petrica Manoila <[email protected]>
GENIVI · Sep 16, 2014 · 538a645 · 538a645
1 parent bbe6881
commit 538a645
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,12 @@
 persistence-common-object ChangeLog
 ===================================
 
+Version 1.0.2 16.09.2014
+------------------------
+1.	Updated protected IF persComTypes.h :
+	- Allow support of the standard C99 instead of redeclaration.
+2.	Separated lib version from package version in configuration.
+
 Version 1.0.1 25.08.2014
 ------------------------
 

diff --git a/configure.ac b/configure.ac
@@ -19,8 +19,8 @@ dnl **************************************************************************
 dnl *** First, define all of the version numbers up front                  ***
 dnl *** In particular, this allows the version macro to be used in AC_INIT ***
 dnl **************************************************************************
-m4_define([LIBPERSOCOMMON_VERSION_S],[1.0.1])
-m4_define([LIBPERSOCOMMON_VERSION_N],[1000001])
+m4_define([PERSCOMMON_PACKAGE_VERSION_S],[1.0.2])
+m4_define([PERSCOMMON_LIB_VERSION_N],[1001001])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
@@ -40,11 +40,11 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["$ACLOCAL_FLAGS -I m4"])
 dnl *********************************
 dnl *** Shared library versioning ***
 dnl *********************************
-PERSCOMMON_MAJOR=$((((LIBPERSOCOMMON_VERSION_N() / 1000) / 1000) % 1000 ))
-PERSCOMMON_MINOR=$(( (LIBPERSOCOMMON_VERSION_N() / 1000) % 1000 ))
-PERSCOMMON_MICRO=$((  LIBPERSOCOMMON_VERSION_N() % 1000 ))
-GENERIC_LIBRARY_VERSION=$PERSCOMMON_MAJOR:$PERSCOMMON_MINOR:$PERSCOMMON_MICRO
-AC_SUBST(GENERIC_LIBRARY_VERSION)
+PERSCOMMON_LIB_VERSION_CURRENT=$((((PERSCOMMON_LIB_VERSION_N() / 1000) / 1000) % 1000 ))
+PERSCOMMON_LIB_VERSION_REVISION=$(( (PERSCOMMON_LIB_VERSION_N() / 1000) % 1000 ))
+PERSCOMMON_LIB_VERSION_AGE=$((  PERSCOMMON_LIB_VERSION_N() % 1000 ))
+PERSCOMMON_LIB_VERSION=$PERSCOMMON_LIB_VERSION_CURRENT:$PERSCOMMON_LIB_VERSION_REVISION:$PERSCOMMON_LIB_VERSION_AGE
+AC_SUBST(PERSCOMMON_LIB_VERSION)
 
 dnl ********************************
 dnl *** Check for basic programs ***

diff --git a/inc/protected/persComTypes.h b/inc/protected/persComTypes.h
@@ -5,7 +5,7 @@
 *
 * Copyright (C) 2012 Continental Automotive Systems, Inc.
 *
-* Author: [email protected]
+* Author: [email protected], [email protected]
 *
 * Interface: protected - Type and constant definitions.
 *
@@ -17,12 +17,17 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 *
 * Date       Author             Reason
-* 2013.02.05 uidl9757  1.0.0.0  CSP_WZ#TODO:  CoC_SSW:Persistence:  interface that defines type and constants
+* 2014.09.12 uid66235  1.0.1.0  GENIVI:allow support of the standard C99 instead of redeclaration
+* 2013.02.05 uidl9757  1.0.0.0  CoC_SSW:Persistence:  interface that defines type and constants
 *
 **********************************************************************************************************************/
 
 #include <stdbool.h>
 
+#ifdef _ISOC99_SOURCE
+#include <stdint.h>
+#endif
+
 #ifndef char_t
 typedef char char_t ;
 #endif
@@ -74,10 +79,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/src/Makefile.am b/src/Makefile.am
@@ -78,7 +78,7 @@ libpers_common_la_SOURCES += \
                               ../src/rawdb/pers_low_level_db_access.c
 endif
 
-libpers_common_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
+libpers_common_la_LDFLAGS = -version-info $(PERSCOMMON_LIB_VERSION)
 
 
 libpers_common_la_LIBADD = \