diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-11-06 15:28:23 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-11-06 15:28:23 +0000 |
| commit | c4efddd7d2063eff2bd8c3b7b968dd844540e920 (patch) | |
| tree | 03baf8eb9ddac388373dc13890df70c92a21a0e7 /epan/dissectors/packet-mq.h | |
| parent | 22760b2d2a065249b21b7cf4be892aba71827279 (diff) | |
From robionekenobi: "packet-mq adapted"
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367
especially comments 8,9,12,13
Patch: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=12014
From me: Remove several uses of DEF_VALSEXT macro
since the above patch removed the definition.
(It seems that Microsoft C expands undefined macros as null;
GCC complains).
svn path=/trunk/; revision=53101
Diffstat (limited to 'epan/dissectors/packet-mq.h')
| -rw-r--r-- | epan/dissectors/packet-mq.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/epan/dissectors/packet-mq.h b/epan/dissectors/packet-mq.h index 5c4da06a7e..6be6720cdb 100644 --- a/epan/dissectors/packet-mq.h +++ b/epan/dissectors/packet-mq.h @@ -33,22 +33,13 @@ #define GET_VALSP(F) (gchar *)GET_VALSV(F) #define DEF_VALSB(A) static const value_string GET_VALSV(A)[] = \ { -#define DEF_VALSXB(A) const value_string GET_VALSV(A)[] = \ +#define DEF_VALSBX(A) const value_string GET_VALSV(A)[] = \ { -#define DEF_VALS1(A) { (guint32)MQ_##A, #A } -#define DEF_VALS2(A,B) { (guint32)MQ_##A, B } +#define DEF_VALS1(A) { (guint32)MQ_##A, #A } +#define DEF_VALS2(A, B) { (guint32)MQ_##A, B } #define DEF_VALSE \ { 0, NULL } \ } -#define DEF_VALSEXT(A) DEF_VALSEXT1(GET_VALSV(A)) -#define DEF_VALSEXT1(A) DEF_VALSEXT2(A) -#define DEF_VALSEXT2(A) value_string_ext A##_ext = VALUE_STRING_EXT_INIT(A) - -#if 0 -#define DEF_VALSEXTX(A) DEF_VALSEXTX1(GET_VALS(A)) -#define DEF_VALSEXTX1(A) DEF_VALSEXTX2(A) -#define DEF_VALSEXTX2(A) extern value_string_ext A##_ext -#endif /* | BASE_RANGE_STRING, GET_VALRV(RVALS(aaa)) */ #define GET_VALRV(A) mq_##A##_rvals @@ -56,14 +47,11 @@ #define GET_VALRP(F) (gchar *)GET_VALRV(F) #define DEF_VALRB(A) const range_string GET_VALRV(A)[] = \ { -#define DEF_VALR1(A) { (guint32)MQ_##A, (guint32)MQ_##A, #A } -#define DEF_VALR3(A,B,C) { (guint32)MQ_##A, (guint32)MQ_##B, C } +#define DEF_VALR1(A) { (guint32)MQ_##A, (guint32)MQ_##A, #A } +#define DEF_VALR3(A, B, C) { (guint32)MQ_##A, (guint32)MQ_##B, C } #define DEF_VALRE \ { 0, 0, NULL } \ } -#if 0 -#define DEF_VALREXTX(A) extern value_string_ext GET_VALRV(A)_ext -#endif typedef struct _mq_ccsid_t { |