One definite grammar fix, and one sort-of-grammar fix. (It felt better)

[perl5.git] / perl.h

diff --git a/perl.h b/perl.h
index d753cdb..e26e475 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -2654,7 +2654,7 @@ typedef struct clone_params CLONE_PARAMS;
 
 #define PERL_SYS_INIT(argc, argv)      Perl_sys_init(argc, argv)
 #define PERL_SYS_INIT3(argc, argv, env)        Perl_sys_init3(argc, argv, env)
-#define PERL_SYS_TERM()                        Perl_sys_term(aTHX)
+#define PERL_SYS_TERM()                        Perl_sys_term()
 
 #ifndef PERL_WRITE_MSG_TO_CONSOLE
 #  define PERL_WRITE_MSG_TO_CONSOLE(io, msg, len) PerlIO_write(io, msg, len)
@@ -3072,12 +3072,9 @@ typedef pthread_key_t    perl_key;
     These formats will still work in perl code.   
     See comments in sv.c for futher details.
 
-       -DvdNUMBER=<number> can be used to redefine VDf
-
-       -DvdNUMBER=0 reverts VDf to "vd", as in perl5.8.7,
-           which works properly but gives compiler warnings
-
     Robin Barker 2005-07-14
+
+    No longer use %1p for VDf = %vd.  RMB 2007-10-19 
 */
 
 #ifndef SVf_
@@ -3098,25 +3095,22 @@ typedef pthread_key_t   perl_key;
 
 #define SVfARG(p) ((void*)(p))
 
-#ifndef vdNUMBER
-#  define vdNUMBER 1
-#endif
- 
-#ifndef VDf
-#  if vdNUMBER 
-#    define VDf STRINGIFY(vdNUMBER) "p"
-#  else
+#ifdef PERL_CORE
+/* not used; but needed for backward compatibilty with XS code? - RMB */ 
+#  undef VDf
+#else
+#  ifndef VDf
 #    define VDf "vd"
 #  endif
 #endif
 
 #ifdef PERL_CORE
 /* not used; but needed for backward compatibilty with XS code? - RMB */ 
+#  undef UVf
+#else
 #  ifndef UVf
 #    define UVf UVuf
 #  endif
-#else
-#  undef UVf
 #endif
 
 #ifdef HASATTRIBUTE_FORMAT
@@ -3970,17 +3964,17 @@ typedef Sighandler_t Sigsave_t;
 #endif
 
 #ifdef USE_PERLIO
-EXTERN_C void PerlIO_teardown(pTHX);
+EXTERN_C void PerlIO_teardown();
 # ifdef USE_ITHREADS
 #  define PERLIO_INIT MUTEX_INIT(&PL_perlio_mutex)
 #  define PERLIO_TERM                          \
        STMT_START {                            \
-               PerlIO_teardown(aTHX);          \
+               PerlIO_teardown();              \
                MUTEX_DESTROY(&PL_perlio_mutex);\
        } STMT_END
 # else
 #  define PERLIO_INIT
-#  define PERLIO_TERM  PerlIO_teardown(aTHX)
+#  define PERLIO_TERM  PerlIO_teardown()
 # endif
 #else
 #  define PERLIO_INIT
@@ -4625,6 +4619,10 @@ typedef struct exitlistentry {
 #  define  FAKE_DEFAULT_SIGNAL_HANDLERS
 #endif
 
+#define PERL_PATCHLEVEL_H_IMPLICIT
+#include "patchlevel.h"
+#undef PERL_PATCHLEVEL_H_IMPLICIT
+
 #ifdef PERL_GLOBAL_STRUCT
 struct perl_vars {
 #  include "perlvars.h"
@@ -5845,11 +5843,6 @@ extern void moncontrol(int);
 #define NO_ENV_ARRAY_IN_MAIN
 #endif
 
-/* and finally... */
-#define PERL_PATCHLEVEL_H_IMPLICIT
-#include "patchlevel.h"
-#undef PERL_PATCHLEVEL_H_IMPLICIT
-
 /* These are used by Perl_pv_escape() and Perl_pv_pretty() 
  * are here so that they are available throughout the core 
  * NOTE that even though some are for _escape and some for _pretty
@@ -5930,4 +5923,3 @@ extern void moncontrol(int);
 */
 
 #endif /* Include guard */
-