summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpider Boardman <spider@orb.nashua.nh.us>1998-02-28 21:02:47 -0500
committerMalcolm Beattie <mbeattie@sable.ox.ac.uk>1998-03-05 18:46:32 +0000
commit4b534093594d92b34206e8072899488b51e4421c (patch)
tree97e46192cbbf1b0dfd4e666dea3bb653ef7c740f
parentb6917549c1d9faccceb8c8d200e8d408a1f58a1d (diff)
downloadperl-4b534093594d92b34206e8072899488b51e4421c.tar.gz
Almost OK: 5.004_61 (threads, perlio)
p4raw-id: //depot/perl@774
-rw-r--r--bytecode.pl4
-rw-r--r--byterun.c2
-rw-r--r--byterun.h2
-rw-r--r--perlsdio.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/bytecode.pl b/bytecode.pl
index 4553edf9bc..2e3f9c6086 100644
--- 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 7c32930a6a..c99fa0850e 100644
--- 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 edc043ddf1..85342b8562 100644
--- 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 5a15a719ca..9825f8ed92 100644
--- 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