Revert r29614 until I figure out why buildbot doesn't like it

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29615 f5534014-38df-0310-8fa8-9805f1628bb7

5 files changed, 18 insertions, 11 deletions

diff --git a/capture-wpcap.c b/capture-wpcap.c
index eb7d92382f..3e4198f207 100644
--- a/capture-wpcap.c
+++ b/capture-wpcap.c
@@ -39,6 +39,9 @@
 #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
 
 
@@ -118,7 +121,7 @@ typedef struct {
 	gboolean	optional;
 } symbol_table_t;
 
-#define SYM(x, y)	{ G_STRINGIFY(x) , (gpointer) &G_PASTE(p_,x), y }
+#define SYM(x, y)	{ STRINGIFY(x) , (gpointer) &CONCAT(p_,x), y }
 
 void
 load_wpcap(void)
diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c
index 9675fcde8d..c2668724dd 100644
--- a/capture_wpcap_packet.c
+++ b/capture_wpcap_packet.c
@@ -36,6 +36,9 @@
 
 #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           */
@@ -136,7 +139,7 @@ typedef struct {
 	gboolean	optional;
 } symbol_table_t;
 
-#define SYM(x, y)	{ G_STRINGIFY(x) , (gpointer) &G_PASTE(p_,x), y }
+#define SYM(x, y)	{ STRINGIFY(x) , (gpointer) &CONCAT(p_,x), y }
 
 void
 wpcap_packet_load(void)
diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h
index f8e1c6ff14..27f0aec58e 100644
--- a/epan/dfilter/syntax-tree.h
+++ b/epan/dfilter/syntax-tree.h
@@ -24,6 +24,7 @@
 #define SYNTAX_TREE_H
 
 #include <glib.h>
+#include "cppmagic.h"
 
 typedef enum {
 	STTYPE_UNINITIALIZED,
@@ -119,9 +120,9 @@ stnode_deprecated(stnode_t *node);
 
 #define STTYPE_ACCESSOR(ret,type,attr,magicnum) \
 	ret \
-	G_PASTE(G_PASTE(G_PASTE(sttype_,type),_),attr) (stnode_t *node) \
+	CONCAT(CONCAT(CONCAT(sttype_,type),_),attr) (stnode_t *node) \
 {\
-	G_PASTE(type,_t)	*value; \
+	CONCAT(type,_t)	*value; \
 	value = stnode_data(node);\
 	assert_magic(value, magicnum); \
 	return value->attr; \
@@ -129,7 +130,7 @@ stnode_deprecated(stnode_t *node);
 
 #define STTYPE_ACCESSOR_PROTOTYPE(ret,type,attr) \
 	ret \
-	G_PASTE(G_PASTE(G_PASTE(sttype_,type),_),attr) (stnode_t *node);
+	CONCAT(CONCAT(CONCAT(sttype_,type),_),attr) (stnode_t *node);
 
 
 #endif
diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index 6b7890ca46..537a1b27fe 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, "%." G_STRINGIFY(FLT_DIG) "g", fv->value.floating);
+	sprintf(buf, "%." 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, "%." G_STRINGIFY(DBL_DIG) "g", fv->value.floating);
+	sprintf(buf, "%." STRINGIFY(DBL_DIG) "g", fv->value.floating);
 }
 
 static gboolean
diff --git a/epan/proto.c b/epan/proto.c
index 6e2ca5e393..285279c928 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, "%." G_STRINGIFY(FLT_DIG) "f", fvalue_get_floating(&finfo->value));
+			g_snprintf(result, size, "%." STRINGIFY(FLT_DIG) "f", fvalue_get_floating(&finfo->value));
 			break;
 
 		case FT_DOUBLE:
-			g_snprintf(result, size, "%." G_STRINGIFY(DBL_DIG) "g", fvalue_get_floating(&finfo->value));
+			g_snprintf(result, size, "%." 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: %." G_STRINGIFY(FLT_DIG) "f",
+				"%s: %." STRINGIFY(FLT_DIG) "f",
 				hfinfo->name, fvalue_get_floating(&fi->value));
 			break;
 
 		case FT_DOUBLE:
 			g_snprintf(label_str, ITEM_LABEL_LENGTH,
-				"%s: %." G_STRINGIFY(DBL_DIG) "g",
+				"%s: %." STRINGIFY(DBL_DIG) "g",
 				hfinfo->name, fvalue_get_floating(&fi->value));
 			break;