Almost OK: 5.004_61 (threads, perlio)

p4raw-id: //depot/perl@774

diff --git a/bytecode.pl b/bytecode.pl
index 4553edf..2e3f9c6 100644 (file)
--- a/bytecode.pl
+++ b/bytecode.pl
@@ -83,7 +83,7 @@ bset_obj_store(void *obj, I32 ix)
 #ifdef INDIRECT_BGET_MACROS
 void byterun(struct bytestream bs)
 #else
-void byterun(FILE *fp)
+void byterun(PerlIO *fp)
 #endif /* INDIRECT_BGET_MACROS */
 {
     dTHR;
@@ -167,7 +167,7 @@ struct bytestream {
 };
 void byterun _((struct bytestream));
 #else
-void byterun _((FILE *));
+void byterun _((PerlIO *));
 #endif /* INDIRECT_BGET_MACROS */
 
 void *bset_obj_store _((void *, I32));

diff --git a/byterun.c b/byterun.c
index 7c32930..c99fa08 100644 (file)
--- a/byterun.c
+++ b/byterun.c
@@ -29,7 +29,7 @@ bset_obj_store(void *obj, I32 ix)
 #ifdef INDIRECT_BGET_MACROS
 void byterun(struct bytestream bs)
 #else
-void byterun(FILE *fp)
+void byterun(PerlIO *fp)
 #endif /* INDIRECT_BGET_MACROS */
 {
     dTHR;

diff --git a/byterun.h b/byterun.h
index edc043d..85342b8 100644 (file)
--- a/byterun.h
+++ b/byterun.h
@@ -17,7 +17,7 @@ struct bytestream {
 };
 void byterun _((struct bytestream));
 #else
-void byterun _((FILE *));
+void byterun _((PerlIO *));
 #endif /* INDIRECT_BGET_MACROS */
 
 void *bset_obj_store _((void *, I32));

diff --git a/perlsdio.h b/perlsdio.h
index 5a15a71..9825f8e 100644 (file)
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -232,7 +232,9 @@
 #undef fopen
 #undef vfprintf
 #undef fgetc
+#undef getc_unlocked
 #undef fputc
+#undef putc_unlocked
 #undef fputs
 #undef ungetc
 #undef fread