diff options
-rwxr-xr-x | include/dlt/dlt_user_macros.h | 2 | ||||
-rwxr-xr-x | include/dlt/dlt_version.h | 16 | ||||
-rwxr-xr-x | include/dlt/dlt_version.h.cmake | 16 | ||||
-rwxr-xr-x | src/daemon/dlt-daemon.c | 2 | ||||
-rwxr-xr-x | src/shared/dlt_common.c | 6 |
5 files changed, 21 insertions, 21 deletions
diff --git a/include/dlt/dlt_user_macros.h b/include/dlt/dlt_user_macros.h index c9b19c9..1916e9c 100755 --- a/include/dlt/dlt_user_macros.h +++ b/include/dlt/dlt_user_macros.h @@ -115,7 +115,7 @@ extern DltContext CONTEXT; * @param DESCRIPTION ASCII string containing description */ #define DLT_REGISTER_APP(APPID,DESCRIPTION) \ - dlt_check_library_version(PACKAGE_MAJOR_VERSION, PACKAGE_MINOR_VERSION ); \ + dlt_check_library_version(_DLT_PACKAGE_MAJOR_VERSION, _DLT_PACKAGE_MINOR_VERSION ); \ dlt_register_app( APPID, DESCRIPTION); diff --git a/include/dlt/dlt_version.h b/include/dlt/dlt_version.h index 70438e7..2c76c74 100755 --- a/include/dlt/dlt_version.h +++ b/include/dlt/dlt_version.h @@ -1,12 +1,12 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -#ifndef __VERSION_H_ -#define __VERSION_H_ +#ifndef __DLT_VERSION_H_ +#define __DLT_VERSION_H_ -#define PACKAGE_VERSION_STATE "" -#define PACKAGE_VERSION "2.4.2" -#define PACKAGE_MAJOR_VERSION "2" -#define PACKAGE_MINOR_VERSION "4" -#define PACKAGE_PATCH_LEVEL "2" -#define PACKAGE_REVISION "v2.4.2_7_g21b9376" +#define _DLT_PACKAGE_VERSION_STATE "" +#define _DLT_PACKAGE_VERSION "2.4.2" +#define _DLT_PACKAGE_MAJOR_VERSION "2" +#define _DLT_PACKAGE_MINOR_VERSION "4" +#define _DLT_PACKAGE_PATCH_LEVEL "2" +#define _DLT_PACKAGE_REVISION "v2.4.2_8_gf44294b" #endif diff --git a/include/dlt/dlt_version.h.cmake b/include/dlt/dlt_version.h.cmake index f217db3..3a80a23 100755 --- a/include/dlt/dlt_version.h.cmake +++ b/include/dlt/dlt_version.h.cmake @@ -1,12 +1,12 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -#ifndef __VERSION_H_ -#define __VERSION_H_ +#ifndef __DLT_VERSION_H_ +#define __DLT_VERSION_H_ -#define PACKAGE_VERSION_STATE "@PRINT_VERSION_STATE@" -#define PACKAGE_VERSION "@PRINT_VERSION@" -#define PACKAGE_MAJOR_VERSION "@PRINT_MAJOR_VERSION@" -#define PACKAGE_MINOR_VERSION "@PRINT_MINOR_VERSION@" -#define PACKAGE_PATCH_LEVEL "@PRINT_PATCH_LEVEL@" -#define PACKAGE_REVISION "@PRINT_REVISION@" +#define _DLT_PACKAGE_VERSION_STATE "@PRINT_VERSION_STATE@" +#define _DLT_PACKAGE_VERSION "@PRINT_VERSION@" +#define _DLT_PACKAGE_MAJOR_VERSION "@PRINT_MAJOR_VERSION@" +#define _DLT_PACKAGE_MINOR_VERSION "@PRINT_MINOR_VERSION@" +#define _DLT_PACKAGE_PATCH_LEVEL "@PRINT_PATCH_LEVEL@" +#define _DLT_PACKAGE_REVISION "@PRINT_REVISION@" #endif diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 51b7b02..4308171 100755 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -132,7 +132,7 @@ static pthread_attr_t dlt_daemon_timingpacket_thread_attr; void usage() { printf("Usage: dlt-daemon [options]\n"); - printf("DLT logging daemon\n"); + printf("DLT logging daemon %s\n", _DLT_PACKAGE_REVISION); printf("Options:\n"); printf(" -d Daemonize\n"); printf(" -h Usage\n"); diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 6b75e79..033ea1f 100755 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -3044,17 +3044,17 @@ speed_t dlt_convert_serial_speed(int baudrate) void dlt_get_version(char *buf) { sprintf(buf,"DLT Package Version: %s %s, Package Revision: %s, build on %s %s\n", - PACKAGE_VERSION, PACKAGE_VERSION_STATE, PACKAGE_REVISION, __DATE__ , __TIME__ ); + _DLT_PACKAGE_VERSION, _DLT_PACKAGE_VERSION_STATE, _DLT_PACKAGE_REVISION, __DATE__ , __TIME__ ); } void dlt_get_major_version(char *buf) { - sprintf(buf,"%s",PACKAGE_MAJOR_VERSION); + sprintf(buf,"%s",_DLT_PACKAGE_MAJOR_VERSION); } void dlt_get_minor_version(char *buf) { - sprintf(buf,"%s",PACKAGE_MINOR_VERSION); + sprintf(buf,"%s",_DLT_PACKAGE_MINOR_VERSION); } |