From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 19 May 2003 19:02:23 +0000 (+0000)
Subject: More Ultrix double definition avoidance.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=87edd44619c51e5cef57cfe22210ce04d510fd47;p=p5sagit%2Fp5-mst-13.2.git

More Ultrix double definition avoidance.

p4raw-id: //depot/perl@19569
---

diff --git a/ext/Socket/Socket.xs b/ext/Socket/Socket.xs
index d4d9393..2c1bf68 100644
--- a/ext/Socket/Socket.xs
+++ b/ext/Socket/Socket.xs
@@ -9,7 +9,7 @@
 # ifdef I_SYS_TYPES
 #  include <sys/types.h>
 # endif
-# if !defined(ultrix)
+# if !defined(ultrix) /* Avoid double definition. */
 #   include <sys/socket.h>
 # endif
 # if defined(USE_SOCKS) && defined(I_SOCKS)
@@ -34,7 +34,9 @@
 #  include <netinet/in.h>
 # endif
 # ifdef I_NETDB
-#  include <netdb.h>
+#  if !defined(ultrix)  /* Avoid double definition. */
+#   include <netdb.h>
+#  endif
 # endif
 # ifdef I_ARPA_INET
 #  include <arpa/inet.h>