Underscore the non-official version number

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

diff --git a/perl.h b/perl.h
index e81d1af..b147654 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)
@@ -3969,12 +3969,12 @@ EXTERN_C void PerlIO_teardown();
 #  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
@@ -4036,6 +4036,7 @@ typedef int (CPERLscope(*runops_proc_t)) (pTHX);
 typedef void (CPERLscope(*share_proc_t)) (pTHX_ SV *sv);
 typedef int  (CPERLscope(*thrhook_proc_t)) (pTHX);
 typedef OP* (CPERLscope(*PPADDR_t)[]) (pTHX);
+typedef bool (CPERLscope(*destroyable_proc_t)) (pTHX_ SV *sv);
 
 /* _ (for $_) must be first in the following list (DEFSV requires it) */
 #define THREADSV_NAMES "_123456789&`'+/.,\\\";^-%=|~:\001\005!@"
@@ -4619,6 +4620,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"
@@ -5839,11 +5844,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
@@ -5924,4 +5924,3 @@ extern void moncontrol(int);
 */
 
 #endif /* Include guard */
-