Not quite so relicy as thought in #11651 (op/concat #4 and #5

[p5sagit/p5-mst-13.2.git] / XSUB.h

diff --git a/XSUB.h b/XSUB.h
index 74e37ed..23f292b 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -66,10 +66,7 @@ handled automatically by C<xsubpp>.
 #  define XS(name) void name(pTHXo_ CV* cv)
 #endif
 
-/* gcc -Wall: if an xsub has no arguments and PPCODE is used
- * and none of ST, XSRETURN or XSprePUSH macros are used
- * then `ax' (setup by dXSARGS) is unused. */
-#define dAX I32 ax PERL_UNUSED_DECL = MARK - PL_stack_base + 1
+#define dAX I32 ax = MARK - PL_stack_base + 1
 
 #define dITEMS I32 items = SP - MARK
 
@@ -93,7 +90,7 @@ handled automatically by C<xsubpp>.
 #  define XSINTERFACE_CVT(ret,name) ret (*name)()
 #endif
 #define dXSFUNCTION(ret)               XSINTERFACE_CVT(ret,XSFUNCTION)
-#define XSINTERFACE_FUNC(ret,cv,f)     ((XSINTERFACE_CVT(ret,cv))(f))
+#define XSINTERFACE_FUNC(ret,cv,f)     ((XSINTERFACE_CVT(ret,))(f))
 #define XSINTERFACE_FUNC_SET(cv,f)     \
                CvXSUBANY(cv).any_dptr = (void (*) (pTHXo_ void*))(f)
 
@@ -261,6 +258,15 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 
 #if (defined(PERL_CAPI) || defined(PERL_IMPLICIT_SYS)) && !defined(PERL_CORE)
 #  ifndef NO_XSLOCKS
+# if defined (NETWARE) && defined (USE_STDIO)
+#    define times              PerlProc_times
+#    define setuid             PerlProc_setuid
+#    define setgid             PerlProc_setgid
+#    define getpid             PerlProc_getpid
+#    define pause              PerlProc_pause
+#    define exit               PerlProc_exit
+#    define _exit              PerlProc__exit
+# else
 #    undef closedir
 #    undef opendir
 #    undef stdin
@@ -276,6 +282,35 @@ 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
+#ifdef NETWARE
+#      undef readdir
+#      undef fstat
+#      undef stat
+#      undef longjmp
+#      undef endhostent
+#      undef endnetent
+#      undef endprotoent
+#      undef endservent
+#      undef gethostbyaddr
+#      undef gethostbyname
+#      undef gethostent
+#      undef getnetbyaddr
+#      undef getnetbyname
+#      undef getnetent
+#      undef getprotobyname
+#      undef getprotobynumber
+#      undef getprotoent
+#      undef getservbyname
+#      undef getservbyport
+#      undef getservent
+#      undef inet_ntoa
+#      undef sethostent
+#      undef setnetent
+#      undef setprotoent
+#      undef setservent
+#endif /* NETWARE */
+
 #    define mkdir              PerlDir_mkdir
 #    define chdir              PerlDir_chdir
 #    define rmdir              PerlDir_rmdir
@@ -413,6 +448,7 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    define shutdown           PerlSock_shutdown
 #    define socket             PerlSock_socket
 #    define socketpair         PerlSock_socketpair
+#      endif   /* NETWARE && USE_STDIO */
 #  endif  /* NO_XSLOCKS */
 #endif  /* PERL_CAPI */