X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlsdio.h;h=46a15de9fa0577055c70302de4a5e5e8e21600be;hb=c15e4c287f38b5a2d53095f441d6ef22247e840b;hp=a539a0a3d9f36c5427334b5ab8f89950bdbb2eae;hpb=17f28c40fa08b585b95d4a2531b1cd975d11e986;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perlsdio.h b/perlsdio.h
index a539a0a..46a15de 100644
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -79,7 +79,11 @@
 #ifdef HAS_SETLINEBUF
 #define PerlIO_setlinebuf(f)		setlinebuf(f);
 #else
-#define PerlIO_setlinebuf(f)		setvbuf(f, Nullch, _IOLBF, 0);
+# ifdef CYGWIN
+#  define PerlIO_setlinebuf(f)
+# else
+#  define PerlIO_setlinebuf(f)		setvbuf(f, Nullch, _IOLBF, 0);
+# endif
 #endif
 
 /* Now our interface to Configure's FILE_xxx macros */
@@ -272,8 +276,14 @@
 #define fputc(c,f)		PerlIO_putc(f,c)
 #define fputs(s,f)		PerlIO_puts(f,s)
 #define getc(f)			PerlIO_getc(f)
+#ifdef getc_unlocked
+#undef getc_unlocked
+#endif
 #define getc_unlocked(f)	PerlIO_getc(f)
 #define putc(c,f)		PerlIO_putc(f,c)
+#ifdef putc_unlocked
+#undef putc_unlocked
+#endif
 #define putc_unlocked(c,f)	PerlIO_putc(c,f)
 #define ungetc(c,f)		PerlIO_ungetc(f,c)
 #if 0