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

diff --git a/perlsdio.h b/perlsdio.h
index 46a15de..c4a1179 100644
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -55,12 +55,18 @@
 #define PerlIO_clearerr(f)		clearerr(f)
 #define PerlIO_flush(f)			Fflush(f)
 #define PerlIO_tell(f)			ftell(f)
+#if defined(USE_64_BIT_STDIO) && defined(HAS_FTELLO) && !defined(USE_FTELL64)
+#define ftell ftello
+#endif
 #if defined(VMS) && !defined(__DECC)
    /* Old VAXC RTL doesn't reset EOF on seek; Perl folk seem to expect this */
 #  define PerlIO_seek(f,o,w)	(((f) && (*f) && ((*f)->_flag &= ~_IOEOF)),fseek(f,o,w))
 #else
 #  define PerlIO_seek(f,o,w)		fseek(f,o,w)
 #endif
+#if defined(USE_64_BIT_STDIO) && defined(HAS_FSEEKO) && !defined(USE_FSEEK64)
+#define fseek fseeko
+#endif
 #ifdef HAS_FGETPOS
 #define PerlIO_getpos(f,p)		fgetpos(f,p)
 #endif
@@ -79,11 +85,7 @@
 #ifdef HAS_SETLINEBUF
 #define PerlIO_setlinebuf(f)		setlinebuf(f);
 #else
-# ifdef CYGWIN
-#  define PerlIO_setlinebuf(f)
-# else
-#  define PerlIO_setlinebuf(f)		setvbuf(f, Nullch, _IOLBF, 0);
-# endif
+#define PerlIO_setlinebuf(f)		setvbuf(f, Nullch, _IOLBF, 0);
 #endif
 
 /* Now our interface to Configure's FILE_xxx macros */
@@ -211,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_
@@ -313,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_