X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=2d1b8edad7c27c9883f8c2b1f0695de3271a815e;hb=b13c494218827599481238f7c7f4125dd056dce1;hp=1d73fb13d01a7f29bd29df33b84d75b5d164075b;hpb=d6376244c2261025775e8b11a6a64d7c9e0d1612;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/XSUB.h b/XSUB.h
index 1d73fb1..2d1b8ed 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -339,9 +339,9 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    define putenv		PerlEnv_putenv
 #    define getenv		PerlEnv_getenv
 #    define uname		PerlEnv_uname
-#    define stdin		PerlIO_stdin()
-#    define stdout		PerlIO_stdout()
-#    define stderr		PerlIO_stderr()
+#    define stdin		PerlSIO_stdin()
+#    define stdout		PerlSIO_stdout()
+#    define stderr		PerlSIO_stderr()
 #    define fopen		PerlIO_open
 #    define fclose		PerlIO_close
 #    define feof		PerlIO_eof
@@ -357,9 +357,9 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    define freopen		PerlIO_reopen
 #    define fread(b,s,c,f)	PerlIO_read((f),(b),(s*c))
 #    define fwrite(b,s,c,f)	PerlIO_write((f),(b),(s*c))
-#    define setbuf		PerlIO_setbuf
-#    define setvbuf		PerlIO_setvbuf
-#    define setlinebuf		PerlIO_setlinebuf
+#    define setbuf		PerlSIO_setbuf
+#    define setvbuf		PerlSIO_setvbuf
+#    define setlinebuf		PerlSIO_setlinebuf
 #    define stdoutf		PerlIO_stdoutf
 #    define vfprintf		PerlIO_vprintf
 #    define ftell		PerlIO_tell
@@ -421,6 +421,7 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    define longjmp		PerlProc_longjmp
 #    define signal		PerlProc_signal
 #    define getpid		PerlProc_getpid
+#    define gettimeofday	PerlProc_gettimeofday
 #    define htonl		PerlSock_htonl
 #    define htons		PerlSock_htons
 #    define ntohl		PerlSock_ntohl
@@ -465,6 +466,20 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    define socket		PerlSock_socket
 #    define socketpair		PerlSock_socketpair
 #	endif	/* NETWARE && USE_STDIO */
+
+#    ifdef USE_SOCKETS_AS_HANDLES
+#      undef fd_set
+#      undef FD_SET
+#      undef FD_CLR
+#      undef FD_ISSET
+#      undef FD_ZERO
+#      define fd_set		Perl_fd_set
+#      define FD_SET(n,p)	PERL_FD_SET(n,p)
+#      define FD_CLR(n,p)	PERL_FD_CLR(n,p)
+#      define FD_ISSET(n,p)	PERL_FD_ISSET(n,p)
+#      define FD_ZERO(p)	PERL_FD_ZERO(p)
+#    endif	/* USE_SOCKETS_AS_HANDLES */
+
 #  endif  /* NO_XSLOCKS */
 #endif  /* PERL_IMPLICIT_SYS && !PERL_CORE */