From 8afdf51d9fd1dcd89393fd8a55b14aedc5ca8bef Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sun, 14 Jun 2009 20:57:57 +0000
Subject: From Didier Gautheron via bug 3531:

Recent glib versions always include signal.h in gbacktrace.h

On Linux PPC signal.h defines PT_R4 which is also defined by samba and
compilation fails.

svn path=/trunk/; revision=28727
---
 epan/dissectors/packet-dcerpc.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'epan/dissectors/packet-dcerpc.h')

diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h
index 4a9616d49a..bb76ce4c46 100644
--- a/epan/dissectors/packet-dcerpc.h
+++ b/epan/dissectors/packet-dcerpc.h
@@ -28,6 +28,13 @@
 
 #include <epan/conversation.h>
 
+#ifdef PT_R4
+/* now glib always includes signal.h and on linux PPC 
+ * signal.h defines PT_R4
+*/
+#undef PT_R4
+#endif
+
 typedef struct _e_uuid_t {
     guint32 Data1;
     guint16 Data2;
-- 
cgit v1.2.3