aboutsummaryrefslogtreecommitdiffstats
path: root/capture_wpcap_packet.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-29 07:53:48 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-29 07:53:48 +0000
commit4d0b8d190a9fe56ac2e3d805f8d9432612542a64 (patch)
tree6230113ec6e11ee94c036cab8da3b813d853e4ff /capture_wpcap_packet.c
parent5c2816e8e6489e0fec4b9968cabe775c474225af (diff)
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
Diffstat (limited to 'capture_wpcap_packet.c')
-rw-r--r--capture_wpcap_packet.c5
1 files changed, 4 insertions, 1 deletions
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)