diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-04-17 23:13:33 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-04-18 03:20:52 +0000 |
| commit | 55d5c0f01bf969010ff433ec17d254c2235bfec0 (patch) | |
| tree | cbbc6517b1d2cef1266a46993819732e0cca53a4 /epan/value_string.h | |
| parent | 0f78d03609b6aebb1ad6778672334902f0c6d7f3 (diff) | |
Add a hack to _VS_ENUM_XXX to prevent gcc "warning: comma at end of enumerator list [-pedantic]"
Change-Id: Icfab3cf8e152a2ee239c042e5bfbd9260d102035
Reviewed-on: https://code.wireshark.org/review/1194
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/value_string.h')
| -rw-r--r-- | epan/value_string.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/value_string.h b/epan/value_string.h index 1fe7858dac..d62c2d7951 100644 --- a/epan/value_string.h +++ b/epan/value_string.h @@ -72,10 +72,10 @@ typedef struct _value_string { #endif /* -- Public -- */ -#define VALUE_STRING_ENUM( array_name) _VS_ENUM_XXX( array_name, _VS_ENUM_ENTRY) -#define VALUE_STRING_ARRAY( array_name) _VS_ARRAY_SC_XXX(array_name, _VS_ARRAY_ENTRY, static) -#define VALUE_STRING_ARRAY_GLOBAL_DEF( array_name) _VS_ARRAY_XXX(array_name, _VS_ARRAY_ENTRY) -#define VALUE_STRING_ARRAY_GLOBAL_DCL( array_name) _VS_ARRAY_SC_TYPE_NAME(array_name, extern) +#define VALUE_STRING_ENUM( array_name) _VS_ENUM_XXX( array_name, _VS_ENUM_ENTRY) +#define VALUE_STRING_ARRAY( array_name) _VS_ARRAY_SC_XXX(array_name, _VS_ARRAY_ENTRY, static) +#define VALUE_STRING_ARRAY_GLOBAL_DEF( array_name) _VS_ARRAY_XXX(array_name, _VS_ARRAY_ENTRY) +#define VALUE_STRING_ARRAY_GLOBAL_DCL( array_name) _VS_ARRAY_SC_TYPE_NAME(array_name, extern) #define VALUE_STRING_ENUM2( array_name) _VS_ENUM_XXX( array_name, _VS_ENUM_ENTRY2) #define VALUE_STRING_ARRAY2( array_name) _VS_ARRAY_SC_XXX(array_name, _VS_ARRAY_ENTRY2, static) @@ -86,16 +86,17 @@ typedef struct _value_string { #define _VS_ENUM_XXX(array_name, macro) \ enum { \ array_name##_VALUE_STRING_LIST(macro) \ + _##array_name##_ENUM_DUMMY = 0 \ } #define _VS_ARRAY_SC_XXX(array_name, macro, sc) \ - _VS_ARRAY_SC_TYPE_NAME(array_name, sc) = { \ + _VS_ARRAY_SC_TYPE_NAME(array_name, sc) = { \ array_name##_VALUE_STRING_LIST(macro) \ { 0, NULL } \ } #define _VS_ARRAY_XXX(array_name, macro) \ - _VS_ARRAY_TYPE_NAME(array_name) = { \ + _VS_ARRAY_TYPE_NAME(array_name) = { \ array_name##_VALUE_STRING_LIST(macro) \ { 0, NULL } \ } |