aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2006-06-20 05:59:55 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2006-06-20 05:59:55 +0000
commit0d3e4785934a53aa827ed883bed54c6a597de54d (patch)
tree44d4bea7e064bbeda636863dfa26e92a06bafef7
parent4d4103874499e4c724ae7536cc17e0f5c0669785 (diff)
From Albert Chin:
This fixes a redefine of AF_INET6 on AIX 4.3.3. We pull in <sys/socket.h> so the OS can define it first, nullifying the #define in epan/inet_v6defs.h. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18522 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--epan/dissectors/packet-ssl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index a788c66c61..42e321bc7e 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -96,6 +96,11 @@
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
#include <glib.h>
#include <epan/conversation.h>