Win32 and makedef.pl fall-out of PerlIO/pTHX stuff

p4raw-id: //depot/perlio@13854

diff --git a/makedef.pl b/makedef.pl
index 40ede54..9f490e0 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -174,7 +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");
+       output_symbol("perl_clone_host");
        }
 }
 
@@ -655,7 +655,6 @@ my @layer_syms = qw(
                         PerlIO_pending
                         PerlIO_push
                         PerlIO_sv_dup
-                        PerlIO_unread
                         PL_def_layerlist
                         PL_known_layers
                         PL_perlio
@@ -1200,6 +1199,5 @@ PerlIO_setpos
 PerlIO_sprintf
 PerlIO_sv_dup
 PerlIO_tmpfile
-PerlIO_unread
 PerlIO_vsprintf
 perlsio_binmode

diff --git a/perlio.h b/perlio.h
index b7b2556..b12539d 100644 (file)
--- a/perlio.h
+++ b/perlio.h
@@ -210,9 +210,6 @@ extern PerlIO *PerlIO_openn(pTHX_ const char *layers, const char *mode,
                            int fd, int imode, int perm, PerlIO *old,
                            int narg, SV **arg);
 #endif
-#ifndef PerlIO_close
-extern int PerlIO_close(PerlIO *);
-#endif
 #ifndef PerlIO_eof
 extern int PerlIO_eof(PerlIO *);
 #endif
@@ -228,15 +225,9 @@ extern int PerlIO_getc(PerlIO *);
 #ifndef PerlIO_putc
 extern int PerlIO_putc(PerlIO *, int);
 #endif
-#ifndef PerlIO_flush
-extern int PerlIO_flush(PerlIO *);
-#endif
 #ifndef PerlIO_ungetc
 extern int PerlIO_ungetc(PerlIO *, int);
 #endif
-#ifndef PerlIO_fileno
-extern int PerlIO_fileno(PerlIO *);
-#endif
 #ifndef PerlIO_fdopen
 extern PerlIO *PerlIO_fdopen(int, const char *);
 #endif

diff --git a/perlio.sym b/perlio.sym
index d7a345c..a68382e 100644 (file)
--- a/perlio.sym
+++ b/perlio.sym
@@ -1,39 +1,18 @@
 # Symbols which arise as part of the PerlIO abstraction
 
-PerlIO_stderr
-PerlIO_stderr
-PerlIO_stdin
-PerlIO_stdout
 PerlIO_fast_gets
 PerlIO_has_cntptr
 PerlIO_canset_cnt
-PerlIO_set_cnt
-PerlIO_set_ptrcnt
-PerlIO_get_cnt
-PerlIO_get_bufsiz
-PerlIO_get_ptr
-PerlIO_get_base
 PerlIO_has_base
 PerlIO_puts
 PerlIO_open
 PerlIO_fdopen
 PerlIO_reopen
-PerlIO_close
-PerlIO_eof
 PerlIO_getname
 PerlIO_getc
-PerlIO_error
-PerlIO_clearerr
-PerlIO_flush
-PerlIO_fileno
-PerlIO_setlinebuf
 PerlIO_putc
 PerlIO_ungetc
-PerlIO_read
-PerlIO_write
 PerlIO_vprintf
-PerlIO_tell
-PerlIO_seek
 PerlIO_rewind
 PerlIO_printf
 PerlIO_stdoutf

diff --git a/win32/win32.c b/win32/win32.c
index bad0349..8ffffd5 100644 (file)
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -7,7 +7,7 @@
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  */
-
+#define PERLIO_NOT_STDIO 0 
 #define WIN32_LEAN_AND_MEAN
 #define WIN32IO_IS_STDIO
 #include <tchar.h>
@@ -25,7 +25,6 @@
 
 /* #include "config.h" */
 
-#define PERLIO_NOT_STDIO 0 
 #if !defined(PERLIO_IS_STDIO) && !defined(USE_SFIO)
 #define PerlIO FILE
 #endif