summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig A. Berry <craigberry@mac.com>2015-07-16 06:34:42 -0500
committerCraig A. Berry <craigberry@mac.com>2015-07-16 17:48:50 -0500
commit9b1753cf7072d34b7e4bd1ea60369cbaf80e6152 (patch)
tree9247a5ca3fcea9311887300337d604de4acb0b2f
parent0d610ac116dfe1f7752682b7e30e8019569d8adb (diff)
downloadperl-9b1753cf7072d34b7e4bd1ea60369cbaf80e6152.tar.gz
Fix thinko in perlsdio.h.
In 04ce8649990 I inadvertently created conflicting definitions for PerlIO_ungetc on the non-VMS branch of an #ifdef. This broke a NetWare build that was still based on the stdio layer. See <http://nntp.perl.org/group/perl.perl5.porters/228427>. Even though stdio is no longer supported, we really ought to ship something that compiles up until the point where we remove it, which will hopefully be soon for perlsdio.h. N.B. This commit is not sufficient to get stdio as the base layer working again. Notably XS::APITest is broken for unrelated reasons.
-rw-r--r--perlsdio.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/perlsdio.h b/perlsdio.h
index cb25577579..351836128c 100644
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -47,10 +47,9 @@ END_EXTERN_C
((*(f))->_ptr > (*(f))->_base)) ? \
((*(f))->_cnt++, *(--(*(f))->_ptr) = (c)) : decc$ungetc(c,f)))
#else
-# define PerlIO_ungetc(f,c) ungetc(c,f)
+# define PerlIO_ungetc(f,c) PerlSIO_ungetc(c,f)
#endif
#define PerlIO_getc(f) PerlSIO_fgetc(f)
-#define PerlIO_ungetc(f,c) PerlSIO_ungetc(c,f)
#define PerlIO_read(f,buf,count) (SSize_t)PerlSIO_fread(buf,1,count,f)
#define PerlIO_tell(f) PerlSIO_ftell(f)
#define PerlIO_eof(f) PerlSIO_feof(f)