Use G_STRINGIFY/G_PASTE

[obnox/wireshark/wip.git] / capture_wpcap_packet.c

diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c
index c2668724dd0212e3b34fe2cd35e4449c8f0a74e7..9675fcde8df310d983e7bc9030b3d7c58a94842f 100644 (file)
--- 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)