Re: [DOC PATCH] Re: [ID 20020613.003] context incorrectly reported

[perl5.git] / XSUB.h

diff --git a/XSUB.h b/XSUB.h
index e05b369..2d1b8ed 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -1,9 +1,20 @@
+/*    XSUB.h
+ *
+ *    Copyright (c) 1997-2002, Larry Wall
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ */
+
 #ifndef _INC_PERL_XSUB_H
 #define _INC_PERL_XSUB_H 1
 
 /* first, some documentation for xsubpp-generated items */
 
 /*
+=head1 Variables created by C<xsubpp> and C<xsubpp> internal functions
+
 =for apidoc Amn|char*|CLASS
 Variable which is setup by C<xsubpp> to indicate the 
 class name for a C++ XS constructor.  This is always a C<char*>.  See C<THIS>.
@@ -98,6 +109,8 @@ handled automatically by C<xsubpp>.
 /* Typically used to return values from XS functions.       */
 
 /*
+=head1 Stack Manipulation Macros
+
 =for apidoc Am|void|XST_mIV|int pos|IV iv
 Place an integer into the specified position C<pos> on the stack.  The
 value is stored in a new mortal SV.
@@ -147,6 +160,8 @@ Return C<&PL_sv_undef> from an XSUB immediately.  Uses C<XST_mUNDEF>.
 =for apidoc Ams||XSRETURN_EMPTY
 Return an empty list from an XSUB immediately.
 
+=head1 Variables created by C<xsubpp> and C<xsubpp> internal functions
+
 =for apidoc AmU||newXSproto
 Used by C<xsubpp> to hook up XSUBs as Perl subs.  Adds Perl prototypes to
 the subs.
@@ -281,7 +296,7 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    undef ungetc
 #    undef fileno
 
-//Following symbols were giving redefinition errors while building extensions - sgp 17th Oct 2000
+/* Following symbols were giving redefinition errors while building extensions - sgp 17th Oct 2000 */
 #ifdef NETWARE
 #      undef readdir
 #      undef fstat
@@ -310,6 +325,8 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #      undef setservent
 #endif /* NETWARE */
 
+#    undef  socketpair
+
 #    define mkdir              PerlDir_mkdir
 #    define chdir              PerlDir_chdir
 #    define rmdir              PerlDir_rmdir
@@ -322,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
@@ -340,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
@@ -404,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
@@ -448,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 */