diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-06-14 20:57:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-06-14 20:57:57 +0000 |
| commit | 8afdf51d9fd1dcd89393fd8a55b14aedc5ca8bef (patch) | |
| tree | 80a63f6a608c8447eb81f609552397390c424663 | |
| parent | 88c2ab508471dd1e783825b7a8e8e90a5d21a43d (diff) | |
| download | wireshark-8afdf51d9fd1dcd89393fd8a55b14aedc5ca8bef.tar.gz | |
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
| -rw-r--r-- | epan/dissectors/packet-dcerpc.h | 7 |
1 files changed, 7 insertions, 0 deletions
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; |