diff options
| author | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-09-23 20:03:38 +0200 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-09-23 20:03:38 +0200 |
| commit | 0eaf6ec6b762018db31f7626bbc6e2cdfc374c5c (patch) | |
| tree | b422bd734daedbd2e5fbd9b17f53dbc86d144c6c /include | |
| parent | 92e89722f952c156254ff752d75edfdb26474ff6 (diff) | |
| parent | 7d6dab10064a6fc0c1902f8a747afb5ae0290eb6 (diff) | |
| download | DLT-daemon-0eaf6ec6b762018db31f7626bbc6e2cdfc374c5c.tar.gz | |
Merge branch 'develop_performance' into develop
Conflicts:
include/dlt/dlt_version.h
src/daemon/dlt-daemon.c
Diffstat (limited to 'include')
| -rwxr-xr-x | include/dlt/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | include/dlt/dlt_user.h | 3 |
2 files changed, 4 insertions, 1 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; /************************************************************************************************** |