Still buggy findgteprime, fix from Eric Joanis <joanis@cs.toronto.edu>.

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

diff --git a/makedef.pl b/makedef.pl
index 70682f7..4385f1a 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -73,8 +73,8 @@ if ($PLATFORM eq 'aix') {
 }
 elsif ($PLATFORM eq 'win32') {
     $CCTYPE = "MSVC" unless defined $CCTYPE;
-    foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,\r
-               $pp_sym, $globvar_sym, $perlio_sym) {\r
+    foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
+               $pp_sym, $globvar_sym, $perlio_sym) {
        s!^!..\\!;
     }
 }
@@ -88,7 +88,7 @@ unless ($PLATFORM eq 'win32') {
        }
        if ($PLATFORM eq 'os2') {
            $CONFIG_ARGS = $1 if /^(?:config_args)='(.+)'$/;
-           $ARCHNAME = $1 if /^(?:archname)='(.+)'$/;
+           $ARCHNAME =    $1 if /^(?:archname)='(.+)'$/;
        }
     }
     close(CFG);
@@ -97,12 +97,9 @@ unless ($PLATFORM eq 'win32') {
 open(CFG,$config_h) || die "Cannot open $config_h: $!\n";
 while (<CFG>) {
     $define{$1} = 1 if /^\s*#\s*define\s+(MYMALLOC)\b/;
-    $define{$1} = 1 if /^\s*#\s*define\s+(USE_5005THREADS)\b/;
-    $define{$1} = 1 if /^\s*#\s*define\s+(USE_ITHREADS)\b/;
-    $define{$1} = 1 if /^\s*#\s*define\s+(USE_PERLIO)\b/;
     $define{$1} = 1 if /^\s*#\s*define\s+(MULTIPLICITY)\b/;
-    $define{$1} = 1 if /^\s*#\s*define\s+(PERL_IMPLICIT_SYS)\b/;
-    $define{$1} = 1 if /^\s*#\s*define\s+(PERL_BINCOMPAT_5005)\b/;
+    $define{$1} = 1 if /^\s*#\s*define\s+(PERL_\w+)\b/;
+    $define{$1} = 1 if /^\s*#\s*define\s+(USE_\w+)\b/;
 }
 close(CFG);
 
@@ -135,7 +132,7 @@ if ($define{PERL_OBJECT}) {
 
 if ($PLATFORM eq 'win32') {
     warn join(' ',keys %define)."\n";
-    print "LIBRARY Perl56\n";
+    print "LIBRARY Perl57\n";
     print "DESCRIPTION 'Perl interpreter'\n";
     print "EXPORTS\n";
     if ($define{PERL_IMPLICIT_SYS}) {
@@ -315,7 +312,6 @@ elsif ($PLATFORM eq 'os2') {
 
 unless ($define{'DEBUGGING'}) {
     skip_symbols [qw(
-                   Perl_deb
                    Perl_deb_growlevel
                    Perl_debop
                    Perl_debprofdump
@@ -573,8 +569,8 @@ while (<DATA>) {
 
 if ($PLATFORM eq 'win32') {
     foreach my $symbol (qw(
-                           setuid\r
-                           setgid\r
+                           setuid
+                           setgid
                            boot_DynaLoader
                            Perl_init_os_extras
                            Perl_thread_create
@@ -683,47 +679,47 @@ if ($PLATFORM eq 'win32') {
                            win32_getpid
                            win32_crypt
                            win32_dynaload
-\r
-                           win32_stdin\r
-                           win32_stdout\r
-                           win32_stderr\r
-                           win32_ferror\r
-                           win32_feof\r
-                           win32_strerror\r
-                           win32_fprintf\r
-                           win32_printf\r
-                           win32_vfprintf\r
-                           win32_vprintf\r
-                           win32_fread\r
-                           win32_fwrite\r
-                           win32_fopen\r
-                           win32_fdopen\r
-                           win32_freopen\r
-                           win32_fclose\r
-                           win32_fputs\r
-                           win32_fputc\r
-                           win32_ungetc\r
-                           win32_getc\r
-                           win32_fileno\r
-                           win32_clearerr\r
-                           win32_fflush\r
-                           win32_ftell\r
-                           win32_fseek\r
-                           win32_fgetpos\r
-                           win32_fsetpos\r
-                           win32_rewind\r
-                           win32_tmpfile\r
-                           win32_setbuf\r
-                           win32_setvbuf\r
-                           win32_flushall\r
-                           win32_fcloseall\r
-                           win32_fgets\r
-                           win32_gets\r
-                           win32_fgetc\r
-                           win32_putc\r
-                           win32_puts\r
-                           win32_getchar\r
-                           win32_putchar\r
+
+                           win32_stdin
+                           win32_stdout
+                           win32_stderr
+                           win32_ferror
+                           win32_feof
+                           win32_strerror
+                           win32_fprintf
+                           win32_printf
+                           win32_vfprintf
+                           win32_vprintf
+                           win32_fread
+                           win32_fwrite
+                           win32_fopen
+                           win32_fdopen
+                           win32_freopen
+                           win32_fclose
+                           win32_fputs
+                           win32_fputc
+                           win32_ungetc
+                           win32_getc
+                           win32_fileno
+                           win32_clearerr
+                           win32_fflush
+                           win32_ftell
+                           win32_fseek
+                           win32_fgetpos
+                           win32_fsetpos
+                           win32_rewind
+                           win32_tmpfile
+                           win32_setbuf
+                           win32_setvbuf
+                           win32_flushall
+                           win32_fcloseall
+                           win32_fgets
+                           win32_gets
+                           win32_fgetc
+                           win32_putc
+                           win32_puts
+                           win32_getchar
+                           win32_putchar
                           ))
     {
        try_symbol($symbol);
@@ -801,3 +797,29 @@ perl_destruct
 perl_free
 perl_parse
 perl_run
+PerlIO_define_layer
+PerlIOBuf_set_ptrcnt
+PerlIOBuf_get_cnt
+PerlIOBuf_get_ptr
+PerlIOBuf_bufsiz
+PerlIOBuf_setlinebuf
+PerlIOBase_clearerr
+PerlIOBase_error
+PerlIOBase_eof
+PerlIOBuf_tell
+PerlIOBuf_seek
+PerlIOBuf_write
+PerlIOBuf_unread
+PerlIOBuf_read
+PerlIOBuf_reopen
+PerlIOBuf_open
+PerlIOBuf_fdopen
+PerlIOBase_fileno
+PerlIOBuf_pushed
+PerlIOBuf_fill
+PerlIOBuf_flush
+PerlIOBase_close
+PerlIO_define_layer
+PerlIO_pending
+PerlIO_unread
+PerlIO_push
\ No newline at end of file