diff options
| author | Petrica Manoila <petrica.manoila@continental-corporation.com> | 2014-09-16 17:26:27 +0200 |
|---|---|---|
| committer | Petrica Manoila <petrica.manoila@continental-corporation.com> | 2014-09-16 17:28:05 +0200 |
| commit | 538a645c0325172ec76b2ec62b45f5a3e3f512f7 (patch) | |
| tree | 12a8657d3d9d6e42bac73804d2f36bf83bb3cf2f | |
| parent | bbe6881bf7feac78d848910aed8dd6d0bd52044c (diff) | |
| download | persistence-common-object-538a645c0325172ec76b2ec62b45f5a3e3f512f7.tar.gz | |
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 <petrica.manoila@continental-corporation.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | inc/protected/persComTypes.h | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 23 insertions, 10 deletions
@@ -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 index e41f59a..372672e 100644 --- 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 index 4fc0ff7..47a6664 100644 --- a/inc/protected/persComTypes.h +++ b/inc/protected/persComTypes.h @@ -5,7 +5,7 @@ * * Copyright (C) 2012 Continental Automotive Systems, Inc. * -* Author: Ionut.Ieremie@continental-corporation.com +* Author: Ionut.Ieremie@continental-corporation.com, guy.sagnes@continental-corporation.com * * 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 index c2a7a57..4e2f087 100644 --- 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 = \ |