X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlsdio.h;h=fd990c06d8376eb97c357fcb3df7f6e385c8c065;hb=117dada22e1a48990acd498dee229f361feda1fa;hp=0d6612b533a5fefb151ec8af398d2bbf8b56c686;hpb=bf348c4016bc75478862ef0ba29139e4db9dc252;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perlsdio.h b/perlsdio.h
index 0d6612b..fd990c0 100644
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -18,11 +18,7 @@
 #define PerlIO_open			fopen
 #define PerlIO_fdopen			fdopen
 #define PerlIO_reopen			freopen
-#ifdef SOCKS_64BIT_BUG
-#  define PerlIO_close(f)		(Perl_do_s64_delete_buffer(f), fclose(f))
-#else
-#  define PerlIO_close(f)		fclose(f)
-#endif
+#define PerlIO_close(f)			fclose(f)
 #define PerlIO_puts(f,s)		fputs(s,f)
 #define PerlIO_putc(f,c)		fputc(c,f)
 #if defined(VMS)
@@ -47,17 +43,10 @@
 		(feof(f) ? 0 : (SSize_t)fread(buf,1,count,f))
 #  define PerlIO_tell(f)		ftell(f)
 #else
-#  ifdef SOCKS_64BIT_BUG
-#    define PerlIO_getc(f)		Perl_do_s64_getc(f)
-#    define PerlIO_ungetc(f,c)		Perl_do_s64_ungetc(c,f)
-#    define PerlIO_read(f,buf,count)	Perl_do_s64_fread(buf,count,f)
-#    define PerlIO_tell(f)		Perl_do_s64_tell(f)
-#  else
-#    define PerlIO_getc(f)		getc(f)
-#    define PerlIO_ungetc(f,c)		ungetc(c,f)
-#    define PerlIO_read(f,buf,count)	(SSize_t)fread(buf,1,count,f)
-#    define PerlIO_tell(f)		ftell(f)
-#  endif /* SOCKS_64BIT_BUG */
+#  define PerlIO_getc(f)		getc(f)
+#  define PerlIO_ungetc(f,c)		ungetc(c,f)
+#  define PerlIO_read(f,buf,count)	(SSize_t)fread(buf,1,count,f)
+#  define PerlIO_tell(f)		ftell(f)
 #endif
 #define PerlIO_eof(f)			feof(f)
 #define PerlIO_getname(f,b)		fgetname(f,b)
@@ -65,21 +54,11 @@
 #define PerlIO_fileno(f)		fileno(f)
 #define PerlIO_clearerr(f)		clearerr(f)
 #define PerlIO_flush(f)			Fflush(f)
-#ifdef SOCKS_64BIT_BUG
-#  define PerlIO_seek(f,o,w)		Perl_do_s64_seek(f,o,w)
+#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
-#  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
-#endif
-#ifdef HAS_FGETPOS
-#define PerlIO_getpos(f,p)		fgetpos(f,p)
-#endif
-#ifdef HAS_FSETPOS
-#define PerlIO_setpos(f,p)		fsetpos(f,p)
+#  define PerlIO_seek(f,o,w)		fseek(f,o,w)
 #endif
 
 #define PerlIO_rewind(f)		rewind(f)