projects / p5sagit/p5-mst-13.2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Integrate mainline
[p5sagit/p5-mst-13.2.git] / makedef.pl
diff --git a/makedef.pl b/makedef.pl
index 5d9b7a1..e2cc21b 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -116,7 +116,7 @@ close(CFG);
 # perl.h logic duplication begins
 
 if ($define{USE_ITHREADS}) {
-    if (!$define{MULTIPLICITY} && !$define{PERL_OBJECT}) {
+    if (!$define{MULTIPLICITY}) {
         $define{MULTIPLICITY} = 1;
     }
 }
@@ -126,18 +126,6 @@ $define{PERL_IMPLICIT_CONTEXT} ||=
     $define{USE_5005THREADS}  ||
     $define{MULTIPLICITY} ;
 
-if ($define{PERL_CAPI}) {
-    delete $define{PERL_OBJECT};
-    $define{MULTIPLICITY} = 1;
-    $define{PERL_IMPLICIT_CONTEXT} = 1;
-    $define{PERL_IMPLICIT_SYS}     = 1;
-}
-
-if ($define{PERL_OBJECT}) {
-    $define{PERL_IMPLICIT_CONTEXT} = 1;
-    $define{PERL_IMPLICIT_SYS}     = 1;
-}
-
 # perl.h logic duplication ends
 
 if ($PLATFORM eq 'win32') {
@@ -148,6 +136,7 @@ if ($PLATFORM eq 'win32') {
     if ($define{PERL_IMPLICIT_SYS}) {
        output_symbol("perl_get_host_info");
        output_symbol("perl_alloc_override");
+    output_symbol("perl_clone_host");
     }
 }
 elsif ($PLATFORM eq 'os2') {
@@ -185,6 +174,7 @@ elsif ($PLATFORM eq 'netware') {
        if ($define{PERL_IMPLICIT_SYS}) {
        output_symbol("perl_get_host_info");
        output_symbol("perl_alloc_override");
+       output_symbol("perl_clone_host");
        }
 }
 
@@ -203,7 +193,7 @@ sub emit_symbols {
     foreach my $symbol (@$list) {
        my $skipsym = $symbol;
        # XXX hack
-       if ($define{PERL_OBJECT} || $define{MULTIPLICITY}) {
+       if ($define{MULTIPLICITY}) {
            $skipsym =~ s/^Perl_[GIT](\w+)_ptr$/PL_$1/;
        }
        emit_symbol($symbol) unless exists $skip{$skipsym};
@@ -294,6 +284,8 @@ elsif ($PLATFORM eq 'os2') {
                    ctermid
                    get_sysinfo
                    Perl_OS2_init
+                   Perl_OS2_init3
+                   Perl_OS2_term
                    OS2_Perl_data
                    dlopen
                    dlsym
@@ -304,6 +296,14 @@ elsif ($PLATFORM eq 'os2') {
                    my_flock
                    my_rmdir
                    my_mkdir
+                   my_getpwuid
+                   my_getpwnam
+                   my_getpwent
+                   my_setpwent
+                   my_endpwent
+                   setgrent
+                   endgrent
+                   getgrent
                    malloc_mutex
                    threads_mutex
                    nthreads
@@ -332,6 +332,8 @@ elsif ($PLATFORM eq 'os2') {
                    init_PMWIN_entries
                    PMWIN_entries
                    Perl_hab_GET
+                   loadByOrdinal
+                   pExtFCN
                    )]);
 }
 elsif ($PLATFORM eq 'MacOS') {
@@ -420,7 +422,6 @@ unless ($define{'DEBUGGING'}) {
                    Perl_debprofdump
                    Perl_debstack
                    Perl_debstackptrs
-                   Perl_runops_debug
                    Perl_sv_peek
                    PL_block_type
                    PL_watchaddr
@@ -457,14 +458,16 @@ unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) {
                    )];
 }
 
+unless ($define{'USE_REENTRANT_API'}) {
+    skip_symbols [qw(
+                   PL_reentrant_buffer
+                   )];
+}
+
 if ($define{'MYMALLOC'}) {
     emit_symbols [qw(
                    Perl_dump_mstats
                    Perl_get_mstats
-                   Perl_malloc
-                   Perl_mfree
-                   Perl_realloc
-                   Perl_calloc
                    Perl_strdup
                    Perl_putenv
                    )];
@@ -484,10 +487,6 @@ else {
                    PL_malloc_mutex
                    Perl_dump_mstats
                    Perl_get_mstats
-                   Perl_malloc
-                   Perl_mfree
-                   Perl_realloc
-                   Perl_calloc
                    Perl_malloced_size
                    )];
 }
@@ -531,6 +530,10 @@ unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
                    PL_ptr_table
                    PL_op_mutex
+                   PL_regex_pad
+                   PL_regex_padav
+                   PL_sharedsv_space
+                   PL_sharedsv_space_mutex
                    Perl_dirp_dup
                    Perl_cx_dup
                    Perl_si_dup
@@ -553,6 +556,13 @@ unless ($define{'USE_ITHREADS'}) {
                    Perl_ptr_table_store
                    perl_clone
                    perl_clone_using
+                   Perl_sharedsv_find
+                   Perl_sharedsv_init
+                   Perl_sharedsv_lock
+                   Perl_sharedsv_new
+                   Perl_sharedsv_thrcnt_dec
+                   Perl_sharedsv_thrcnt_inc
+                   Perl_sharedsv_unlock
                    )];
 }
 
@@ -618,12 +628,13 @@ my @syms = ($global_sym, $globvar_sym); # $pp_sym is not part of the API
 my @layer_syms = qw(
                         PerlIOBase_clearerr
                         PerlIOBase_close
+                        PerlIOBase_dup
                         PerlIOBase_eof
                         PerlIOBase_error
                         PerlIOBase_fileno
-                        PerlIOBase_setlinebuf
                         PerlIOBase_pushed
                         PerlIOBase_read
+                        PerlIOBase_setlinebuf
                         PerlIOBase_unread
                         PerlIOBuf_bufsiz
                         PerlIOBuf_fill
@@ -638,12 +649,15 @@ my @layer_syms = qw(
                         PerlIOBuf_tell
                         PerlIOBuf_unread
                         PerlIOBuf_write
-                        PerlIO_define_layer
+                        PerlIO_allocate
                         PerlIO_arg_fetch
+                        PerlIO_define_layer
                         PerlIO_pending
-                        PerlIO_allocate
                         PerlIO_push
-                        PerlIO_unread
+                        PerlIO_sv_dup
+                        PL_def_layerlist
+                        PL_known_layers
+                        PL_perlio
 );
 
 if ($define{'USE_PERLIO'}) {
@@ -716,7 +730,7 @@ for my $syms (@syms) {
 
 # variables
 
-if ($define{'PERL_OBJECT'} || $define{'MULTIPLICITY'}) {
+if ($define{'MULTIPLICITY'}) {
     for my $f ($perlvars_h, $intrpvar_h, $thrdvar_h) {
        my $glob = readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
        emit_symbols $glob;
@@ -745,7 +759,7 @@ else {
 sub try_symbol {
     my $symbol = shift;
 
-    return if $symbol !~ /^[A-Za-z]/;
+    return if $symbol !~ /^[A-Za-z_]/;
     return if $symbol =~ /^\#/;
     $symbol =~s/\r//g;
     chomp($symbol);
@@ -766,6 +780,7 @@ if ($PLATFORM eq 'win32') {
                            Perl_thread_create
                            Perl_win32_init
                            RunPerl
+                           win32_async_check
                            win32_errno
                            win32_environ
                            win32_abort
@@ -869,7 +884,11 @@ if ($PLATFORM eq 'win32') {
                            win32_getpid
                            win32_crypt
                            win32_dynaload
-
+                           win32_get_childenv
+                           win32_free_childenv
+                           win32_clearenv
+                           win32_get_childdir
+                           win32_free_childdir
                            win32_stdin
                            win32_stdout
                            win32_stderr
@@ -1039,6 +1058,7 @@ foreach my $symbol (qw(
                        nw_setnetent
                        nw_setprotoent
                        nw_setservent
+                       nw_setsockopt
                        nw_shutdown
                        nw_crypt
                        nw_execvp
@@ -1088,6 +1108,8 @@ sub emit_symbol {
     $export{$symbol} = 1;
 }
 
+my $sym_ord = 0;
+
 sub output_symbol {
     my $symbol = shift;
     $symbol = $bincompat5005{$symbol}
@@ -1118,7 +1140,7 @@ sub output_symbol {
 #      }
     }
     elsif ($PLATFORM eq 'os2') {
-       print qq(    "$symbol"\n);
+       printf qq(    %-31s \@%s\n), qq("$symbol"), ++$sym_ord;
     }
     elsif ($PLATFORM eq 'aix' || $PLATFORM eq 'MacOS') {
        print "$symbol\n";
@@ -1131,6 +1153,7 @@ sub output_symbol {
 1;
 __DATA__
 # extra globals not included above.
+Perl_cxinc
 perl_alloc
 perl_alloc_using
 perl_clone
@@ -1140,41 +1163,42 @@ perl_destruct
 perl_free
 perl_parse
 perl_run
-PerlIO_define_layer
-PerlIOBuf_set_ptrcnt
-PerlIOBuf_get_cnt
-PerlIOBuf_get_ptr
-PerlIOBuf_bufsiz
 PerlIOBase_clearerr
-PerlIOBase_setlinebuf
+PerlIOBase_close
+PerlIOBase_dup
+PerlIOBase_eof
+PerlIOBase_error
+PerlIOBase_fileno
 PerlIOBase_pushed
 PerlIOBase_read
+PerlIOBase_setlinebuf
 PerlIOBase_unread
-PerlIOBase_error
-PerlIOBase_eof
-PerlIOBuf_tell
-PerlIOBuf_seek
-PerlIOBuf_write
-PerlIOBuf_unread
-PerlIOBuf_read
-PerlIOBuf_open
-PerlIOBase_fileno
-PerlIOBuf_pushed
+PerlIOBuf_bufsiz
 PerlIOBuf_fill
 PerlIOBuf_flush
-PerlIOBase_close
-PerlIO_define_layer
-PerlIO_pending
-PerlIO_unread
-PerlIO_push
+PerlIOBuf_get_cnt
+PerlIOBuf_get_ptr
+PerlIOBuf_open
+PerlIOBuf_pushed
+PerlIOBuf_read
+PerlIOBuf_seek
+PerlIOBuf_set_ptrcnt
+PerlIOBuf_tell
+PerlIOBuf_unread
+PerlIOBuf_write
 PerlIO_allocate
-PerlIO_arg_fetch
 PerlIO_apply_layers
-perlsio_binmode
+PerlIO_arg_fetch
 PerlIO_binmode
+PerlIO_define_layer
+PerlIO_define_layer
+PerlIO_getpos
 PerlIO_init
-PerlIO_tmpfile
+PerlIO_pending
+PerlIO_push
 PerlIO_setpos
-PerlIO_getpos
-PerlIO_vsprintf
 PerlIO_sprintf
+PerlIO_sv_dup
+PerlIO_tmpfile
+PerlIO_vsprintf
+perlsio_binmode
Unnamed repository; edit this file to name it for gitweb.