X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FIO%2Fpoll.c;h=9d39d57f2f6230ce670232bff9edca5003b79628;hb=c5cb1db4779e061c5d9179a8fdbb794afe0c22a9;hp=a09c2472a7625da8a00295bd33868340f4c2b853;hpb=91f3b821ca3eaa8b7d74bb338729ba51b7b68a90;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/IO/poll.c b/ext/IO/poll.c
index a09c247..9d39d57 100644
--- a/ext/IO/poll.c
+++ b/ext/IO/poll.c
@@ -12,6 +12,8 @@
 
 #include "EXTERN.h"
 #include "perl.h"
+#include "XSUB.h"
+
 #include "poll.h"
 #ifdef I_SYS_TIME
 # include <sys/time.h>
@@ -20,7 +22,7 @@
 # include <time.h>
 #endif
 #include <sys/types.h>
-#if defined(HAS_SOCKET) && !defined(VMS) /* VMS handles sockets via vmsish.h */
+#if defined(HAS_SOCKET) && !defined(VMS) && !defined(ultrix) /* VMS handles sockets via vmsish.h, ULTRIX dies of socket struct redefinitions */
 #  include <sys/socket.h>
 #endif
 #include <sys/stat.h>
@@ -133,3 +135,12 @@ again:
 }
 
 #endif /* EMULATE_POLL_WITH_SELECT */
+
+/* gcc for SunOS 4 produces code from an empty (code/symbolwise)
+ * source code file that makes the SunOS 4.x /usr/bin/ld fail with
+ * ld: poll.o: premature EOF
+ * To avoid this, have at least something in here.  */
+#if defined(__sun) && !defined(__SVR4) && defined(__GNUC__)
+static int dummy;
+#endif
+