Rename the members of the SV head union to avoid pre-processor

[p5sagit/p5-mst-13.2.git] / makedef.pl

diff --git a/makedef.pl b/makedef.pl
index d14b503..d2b8296 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -63,13 +63,13 @@ if ($PLATFORM eq 'aix') {
 elsif ($PLATFORM =~ /^win(?:32|ce)$/ || $PLATFORM eq 'netware') {
     $CCTYPE = "MSVC" unless defined $CCTYPE;
     foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
-               $pp_sym, $globvar_sym, $perlio_sym) {
+            $pp_sym, $globvar_sym, $perlio_sym) {
        s!^!..\\!;
     }
 }
 elsif ($PLATFORM eq 'MacOS') {
     foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
-               $pp_sym, $globvar_sym, $perlio_sym) {
+            $pp_sym, $globvar_sym, $perlio_sym) {
        s!^!::!;
     }
 }
@@ -81,6 +81,9 @@ unless ($PLATFORM eq 'win32' || $PLATFORM eq 'wince' || $PLATFORM eq 'MacOS' ||
            $_ = $1;
            $define{$1} = 1 while /-D(\w+)/g;
        }
+        if (/^(d_(?:mmap|sigaction))='(.+)'$/) {
+            $define{$1} = $2;
+        }
        if ($PLATFORM eq 'os2') {
            $CONFIG_ARGS = $1 if /^config_args='(.+)'$/;
            $ARCHNAME =    $1 if /^archname='(.+)'$/;
@@ -233,6 +236,7 @@ if ($PLATFORM eq 'win32') {
                     PL_timesbuf
                     main
                     Perl_ErrorNo
+                    Perl_GetVars
                     Perl_do_exec3
                     Perl_do_ipcctl
                     Perl_do_ipcget
@@ -309,6 +313,7 @@ if ($PLATFORM eq 'wince') {
                     win32_spawnvp
                     main
                     Perl_ErrorNo
+                    Perl_GetVars
                     Perl_do_exec3
                     Perl_do_ipcctl
                     Perl_do_ipcget
@@ -347,6 +352,7 @@ elsif ($PLATFORM eq 'aix') {
     skip_symbols([qw(
                     Perl_dump_fds
                     Perl_ErrorNo
+                    Perl_GetVars
                     Perl_my_bcopy
                     Perl_my_bzero
                     Perl_my_chsize
@@ -447,6 +453,7 @@ elsif ($PLATFORM eq 'os2') {
 }
 elsif ($PLATFORM eq 'MacOS') {
     skip_symbols [qw(
+                   Perl_GetVars
                    PL_cryptseen
                    PL_cshlen
                    PL_cshname
@@ -488,6 +495,7 @@ elsif ($PLATFORM eq 'netware') {
                        PL_timesbuf
                        main
                        Perl_ErrorNo
+                       Perl_GetVars
                        Perl_do_exec3
                        Perl_do_ipcctl
                        Perl_do_ipcget
@@ -564,6 +572,12 @@ unless ($define{'DEBUGGING'}) {
                    )];
 }
 
+if ($define{'PERL_IMPLICIT_CONTEXT'}) {
+    skip_symbols [qw(
+                   PL_sig_sv
+                   )];
+}
+
 if ($define{'PERL_IMPLICIT_SYS'}) {
     skip_symbols [qw(
                    Perl_getenv_len
@@ -629,27 +643,9 @@ else {
                    )];
 }
 
-if ($define{'PERL_MALLOC_WRAP'}) {
-    emit_symbols [qw(
-                   PL_memory_wrap
-                   )];
-}
-
-unless ($define{'HAS_MMAP'}) {
-    skip_symbols [qw(
-                   PL_mmap_page_size
-                   )];
-}
-
-unless ($define{'HAS_TIMES'} || $define{'PERL_NEED_TIMESBASE'}) {
+unless ($define{'PERL_MALLOC_WRAP'}) {
     skip_symbols [qw(
-                   PL_timesbase
-                   )];
-}
-
-unless ($define{'PERL_NEED_APPCTX'}) {
-    skip_symbols [qw(
-                   PL_appctx
+                   PL_memory_wrap
                    )];
 }
 
@@ -690,6 +686,8 @@ unless ($define{'USE_ITHREADS'}) {
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
                    PL_ptr_table
+                   PL_pte_root
+                   PL_pte_arenaroot
                    PL_op_mutex
                    PL_regex_pad
                    PL_regex_padav
@@ -747,12 +745,6 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
                    )];
 }
 
-if ($define{'PERL_IMPLICIT_CONTEXT'}) {
-    skip_symbols [qw(
-                   PL_sig_sv
-                   )];
-}
-
 unless ($define{'PERL_IMPLICIT_SYS'}) {
     skip_symbols [qw(
                    perl_alloc_using
@@ -764,39 +756,50 @@ unless ($define{'FAKE_THREADS'}) {
     skip_symbols [qw(PL_curthr)];
 }
 
-unless ($define{'FAKE_DEFAULT_SIGNAL_HANDLERS'}) {
+unless ($define{'PL_OP_SLAB_ALLOC'}) {
+    skip_symbols [qw(
+                     PL_OpPtr
+                     PL_OpSlab
+                     PL_OpSpace
+                    Perl_Slab_Alloc
+                    Perl_Slab_Free
+                    )];
+}
+
+unless ($define{'THREADS_HAVE_PIDS'}) {
+    skip_symbols [qw(PL_ppid)];
+}
+
+unless ($define{'PERL_NEED_APPCTX'}) {
     skip_symbols [qw(
-                   PL_sig_defaulting
+                   PL_appctx
                    )];
 }
 
-unless ($define{'FAKE_PERSISTENT_SIGNAL_HANDLERS'}) {
+unless ($define{'PERL_NEED_TIMESBASE'}) {
     skip_symbols [qw(
-                   PL_sig_ignoring
+                   PL_timesbase
                    )];
 }
 
-unless ($define{'FAKE_DEFAULT_SIGNAL_HANDLERS'} ||
-        $define{'FAKE_PERSISTENT_SIGNAL_HANDLERS'})
-{
+unless ($define{'d_mmap'}) {
     skip_symbols [qw(
-                   PL_sig_handlers_initted
+                   PL_mmap_page_size
                    )];
 }
 
-unless ($define{'PL_OP_SLAB_ALLOC'}) {
+if ($define{'d_sigaction'}) {
     skip_symbols [qw(
-                     PL_OpPtr
-                     PL_OpSlab
-                     PL_OpSpace
-                    Perl_Slab_Alloc
-                    Perl_Slab_Free
-                    )];
+                   PL_sig_trapped
+                   )];
 }
 
-unless ($define{'THREADS_HAVE_PIDS'}) {
-    skip_symbols [qw(PL_ppid)];
-}
+if ($^O ne 'vms') {
+    # VMS does its own thing for these symbols.
+    skip_symbols [qw(PL_sig_handlers_initted
+                     PL_sig_ignoring
+                     PL_sig_defaulting)];
+}  
 
 sub readvar {
     my $file = shift;
@@ -805,26 +808,21 @@ sub readvar {
     my @syms;
     while (<VARS>) {
        # All symbols have a Perl_ prefix because that's what embed.h
-       # sticks in front of them.
-       push(@syms, &$proc($1,$2,$3)) if (/\bPERLVAR(A?I?C?)\(([IGT])(\w+)/);
+       # sticks in front of them.  The A?I?S?C? is strictly speaking
+       # wrong.
+       push(@syms, &$proc($1,$2,$3)) if (/\bPERLVAR(A?I?S?C?)\(([IGT])(\w+)/);
     }
     close(VARS);
     return \@syms;
 }
 
-unless ($define{'PERL_GLOBAL_STRUCT'}) {
-    skip_symbols [qw(
-                    Perl_GetVars
-                    Perl_free_global_struct
-                    Perl_init_global_struct
-                    )];
-}
-
 if ($define{'PERL_GLOBAL_STRUCT'}) {
     my $global = readvar($perlvars_h);
     skip_symbols $global;
     emit_symbol('Perl_GetVars');
     emit_symbols [qw(PL_Vars PL_VarsPtr)] unless $CCTYPE eq 'GCC';
+} else {
+    skip_symbols [qw(Perl_init_global_struct Perl_free_global_struct)];
 }
 
 # functions from *.sym files
@@ -918,6 +916,7 @@ if ($define{'USE_PERLIO'}) {
     if ($define{'USE_SFIO'}) {
        # Old legacy non-stdio "PerlIO"
        skip_symbols \@layer_syms;
+       skip_symbols [qw(perlsio_binmode)];
        # SFIO defines most of the PerlIO routines as macros
        # So undo most of what $perlio_sym has just done - d'oh !
        # Perhaps it would be better to list the ones which do exist
@@ -995,12 +994,14 @@ if ($define{'USE_PERLIO'}) {
     else {
        # PerlIO with layers - export implementation
        emit_symbols \@layer_syms;
+       emit_symbols [qw(perlsio_binmode)];
     }
 } else {
        # -Uuseperlio
        # Skip the PerlIO layer symbols - although
-       # nothing should have exported them any way
+       # nothing should have exported them anyway.
        skip_symbols \@layer_syms;
+       skip_symbols [qw(perlsio_binmode)];
         skip_symbols [qw(PL_def_layerlist PL_known_layers PL_perlio)];
 
        # Also do NOT add abstraction symbols from $perlio_sym
@@ -1492,4 +1493,3 @@ PerlIO_sprintf
 PerlIO_sv_dup
 PerlIO_tmpfile
 PerlIO_vsprintf
-perlsio_binmode