diff options
| author | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-09-23 13:10:27 +0200 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-09-23 13:10:27 +0200 |
| commit | 7d6dab10064a6fc0c1902f8a747afb5ae0290eb6 (patch) | |
| tree | f99e751f0e1e22301fef4824fbace589931b6001 /include | |
| parent | 5a0bf186ad0b3fc886daa163ecc4f336f8f9ad4f (diff) | |
| parent | 50894750e987f38d1769eb1661ec77be3e2a8ba7 (diff) | |
| download | DLT-daemon-7d6dab10064a6fc0c1902f8a747afb5ae0290eb6.tar.gz | |
Merge genivialex:/home/alex/git/DLT-daemon
Conflicts:
include/dlt/dlt_version.h
Diffstat (limited to 'include')
| -rwxr-xr-x | include/dlt/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | include/dlt/dlt_user.h | 3 | ||||
| -rwxr-xr-x | include/dlt/dlt_version.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/dlt/CMakeLists.txt b/include/dlt/CMakeLists.txt index 6ddcfad..95b9929 100755 --- a/include/dlt/CMakeLists.txt +++ b/include/dlt/CMakeLists.txt @@ -35,6 +35,6 @@ # @licence end@ ######## -install(FILES dlt.h dlt_user.h dlt_user_macros.h dlt_client.h dlt_protocol.h dlt_common.h dlt_types.h dlt_version.h +install(FILES dlt.h dlt_user.h dlt_user_macros.h dlt_client.h dlt_protocol.h dlt_common.h dlt_types.h dlt_version.h dlt_shm.h DESTINATION include/dlt COMPONENT devel) diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h index 263a5f2..095bd45 100755 --- a/include/dlt/dlt_user.h +++ b/include/dlt/dlt_user.h @@ -91,6 +91,7 @@ #include "dlt_types.h" #include "dlt_common.h" #include "dlt_user_macros.h" +#include "dlt_shm.h" #if !defined (__WIN32__) #include <semaphore.h> @@ -226,6 +227,8 @@ typedef struct int8_t local_print_mode; /**< Local print mode, controlled by environment variable */ DltRingBuffer rbuf; /**< Ring-buffer for buffering messages during startup and missing connection */ + + DltShm dlt_shm; } DltUser; /************************************************************************************************** diff --git a/include/dlt/dlt_version.h b/include/dlt/dlt_version.h index 2d3fbb7..ec2a75d 100755 --- a/include/dlt/dlt_version.h +++ b/include/dlt/dlt_version.h @@ -7,6 +7,6 @@ #define PACKAGE_MAJOR_VERSION "2" #define PACKAGE_MINOR_VERSION "3" #define PACKAGE_PATCH_LEVEL "0" -#define PACKAGE_REVISION "v2.3.0-RC-2-g1150209" +#define PACKAGE_REVISION "v2.3.0-RC" #endif |