From: Daniel Muiño <dmuino@afip.gov.ar>
Date: Mon, 14 Aug 2000 16:58:11 +0000 (-0300)
Subject: sfio2000
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=25259385426119fb5acf8b2dd97ac8cc49d2e21f;p=p5sagit%2Fp5-mst-13.2.git

sfio2000
Message-ID: <20000814165811.B16368@con2-dgi>

p4raw-id: //depot/perl@6624
---

diff --git a/perlsdio.h b/perlsdio.h
index 7afda68..c4a1179 100644
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -213,9 +213,11 @@
 #define _flsbuf(c,f)  _CANNOT _flsbuf_
 #define fdopen(fd,p)  _CANNOT _fdopen_
 #define fileno(f)  _CANNOT _fileno_
+#if SFIO_VERSION < 20000101L
 #define flockfile(f)  _CANNOT _flockfile_
 #define ftrylockfile(f)  _CANNOT _ftrylockfile_
 #define funlockfile(f)  _CANNOT _funlockfile_
+#endif
 #define getc_unlocked(f)  _CANNOT _getc_unlocked_
 #define putc_unlocked(c,f)  _CANNOT _putc_unlocked_
 #define popen(c,m)  _CANNOT _popen_
@@ -315,9 +317,11 @@
 #define _flsbuf(c,f)		_CANNOT _flsbuf_
 #define getw(f)			_CANNOT _getw_
 #define putw(v,f)		_CANNOT _putw_
+#if SFIO_VERSION < 20000101L
 #define flockfile(f)		_CANNOT _flockfile_
 #define ftrylockfile(f)		_CANNOT _ftrylockfile_
 #define funlockfile(f)		_CANNOT _funlockfile_
+#endif
 #define freopen(p,m,f)		_CANNOT _freopen_
 #define setbuf(f,b)		_CANNOT _setbuf_
 #define setvbuf(f,b,x,s)	_CANNOT _setvbuf_
diff --git a/perlsfio.h b/perlsfio.h
index 00568d1..d0f6471 100644
--- a/perlsfio.h
+++ b/perlsfio.h
@@ -3,6 +3,11 @@
 #include <sfio.h>
 #endif
 
+/* sfio 2000 changed _stdopen to _stdfdopen */
+#if SFIO_VERSION >= 20000101L
+#define _stdopen _stdfdopen 
+#endif
+
 extern Sfio_t*	_stdopen _ARG_((int, const char*));
 extern int	_stdprintf _ARG_((const char*, ...));