diff options
| -rw-r--r-- | capture-wpcap.c | 5 | ||||
| -rw-r--r-- | capture_wpcap_packet.c | 5 | ||||
| -rw-r--r-- | epan/dfilter/syntax-tree.h | 7 | ||||
| -rw-r--r-- | epan/ftypes/ftype-double.c | 4 | ||||
| -rw-r--r-- | epan/proto.c | 8 |
5 files changed, 11 insertions, 18 deletions
diff --git a/capture-wpcap.c b/capture-wpcap.c index 3e4198f207..eb7d92382f 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -39,9 +39,6 @@ #include "capture-pcap-util.h" #include "capture-pcap-util-int.h" -/* XXX - yes, I know, I should move cppmagic.h to a generic location. */ -#include "tools/lemon/cppmagic.h" - #define MAX_WIN_IF_NAME_LEN 511 @@ -121,7 +118,7 @@ typedef struct { gboolean optional; } symbol_table_t; -#define SYM(x, y) { STRINGIFY(x) , (gpointer) &CONCAT(p_,x), y } +#define SYM(x, y) { G_STRINGIFY(x) , (gpointer) &G_PASTE(p_,x), y } void load_wpcap(void) diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c index c2668724dd..9675fcde8d 100644 --- a/capture_wpcap_packet.c +++ b/capture_wpcap_packet.c @@ -36,9 +36,6 @@ #include <pcap.h> -/* XXX - yes, I know, I should move cppmagic.h to a generic location. */ -#include "tools/lemon/cppmagic.h" - #include <epan/value_string.h> #include <winsock2.h> /* Needed here to force a definition of WINVER */ @@ -139,7 +136,7 @@ typedef struct { gboolean optional; } symbol_table_t; -#define SYM(x, y) { STRINGIFY(x) , (gpointer) &CONCAT(p_,x), y } +#define SYM(x, y) { G_STRINGIFY(x) , (gpointer) &G_PASTE(p_,x), y } void wpcap_packet_load(void) diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h index 27f0aec58e..f8e1c6ff14 100644 --- a/epan/dfilter/syntax-tree.h +++ b/epan/dfilter/syntax-tree.h @@ -24,7 +24,6 @@ #define SYNTAX_TREE_H #include <glib.h> -#include "cppmagic.h" typedef enum { STTYPE_UNINITIALIZED, @@ -120,9 +119,9 @@ stnode_deprecated(stnode_t *node); #define STTYPE_ACCESSOR(ret,type,attr,magicnum) \ ret \ - CONCAT(CONCAT(CONCAT(sttype_,type),_),attr) (stnode_t *node) \ + G_PASTE(G_PASTE(G_PASTE(sttype_,type),_),attr) (stnode_t *node) \ {\ - CONCAT(type,_t) *value; \ + G_PASTE(type,_t) *value; \ value = stnode_data(node);\ assert_magic(value, magicnum); \ return value->attr; \ @@ -130,7 +129,7 @@ stnode_deprecated(stnode_t *node); #define STTYPE_ACCESSOR_PROTOTYPE(ret,type,attr) \ ret \ - CONCAT(CONCAT(CONCAT(sttype_,type),_),attr) (stnode_t *node); + G_PASTE(G_PASTE(G_PASTE(sttype_,type),_),attr) (stnode_t *node); #endif diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c index 537a1b27fe..6b7890ca46 100644 --- a/epan/ftypes/ftype-double.c +++ b/epan/ftypes/ftype-double.c @@ -95,7 +95,7 @@ float_val_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_) static void float_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, char *buf) { - sprintf(buf, "%." STRINGIFY(FLT_DIG) "g", fv->value.floating); + sprintf(buf, "%." G_STRINGIFY(FLT_DIG) "g", fv->value.floating); } static int @@ -113,7 +113,7 @@ double_val_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_) static void double_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, char *buf) { - sprintf(buf, "%." STRINGIFY(DBL_DIG) "g", fv->value.floating); + sprintf(buf, "%." G_STRINGIFY(DBL_DIG) "g", fv->value.floating); } static gboolean diff --git a/epan/proto.c b/epan/proto.c index 285279c928..6e2ca5e393 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -3292,11 +3292,11 @@ proto_custom_set(proto_tree* tree, const gchar *field, break; case FT_FLOAT: - g_snprintf(result, size, "%." STRINGIFY(FLT_DIG) "f", fvalue_get_floating(&finfo->value)); + g_snprintf(result, size, "%." G_STRINGIFY(FLT_DIG) "f", fvalue_get_floating(&finfo->value)); break; case FT_DOUBLE: - g_snprintf(result, size, "%." STRINGIFY(DBL_DIG) "g", fvalue_get_floating(&finfo->value)); + g_snprintf(result, size, "%." G_STRINGIFY(DBL_DIG) "g", fvalue_get_floating(&finfo->value)); break; case FT_EBCDIC: @@ -4314,13 +4314,13 @@ proto_item_fill_label(field_info *fi, gchar *label_str) case FT_FLOAT: g_snprintf(label_str, ITEM_LABEL_LENGTH, - "%s: %." STRINGIFY(FLT_DIG) "f", + "%s: %." G_STRINGIFY(FLT_DIG) "f", hfinfo->name, fvalue_get_floating(&fi->value)); break; case FT_DOUBLE: g_snprintf(label_str, ITEM_LABEL_LENGTH, - "%s: %." STRINGIFY(DBL_DIG) "g", + "%s: %." G_STRINGIFY(DBL_DIG) "g", hfinfo->name, fvalue_get_floating(&fi->value)); break; |