diff options
| author | Christian Muck <christian.muck@bmw.de> | 2012-01-18 09:45:40 +0100 |
|---|---|---|
| committer | Christian Muck <christian.muck@bmw.de> | 2012-01-18 09:45:40 +0100 |
| commit | 7348250fccdabfd4762dbae90637373f6585f4eb (patch) | |
| tree | f5df0fb70255d94f75190df64d57e33cf410b5e0 /include | |
| parent | f44294bba3598c84bb5fc766efa81b0634793e42 (diff) | |
| download | DLT-daemon-7348250fccdabfd4762dbae90637373f6585f4eb.tar.gz | |
[GSW-136] Improve including/prefixing of dlt_version.h fixed
Diffstat (limited to 'include')
| -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 |
3 files changed, 17 insertions, 17 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 |