diff options
| author | Jens Hamisch <jens@Strawberry.COM> | 2000-11-24 19:31:30 +0100 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-11-25 18:37:54 +0000 |
| commit | cf829ab07ccc67cf02ca41d6f870136b64d83833 (patch) | |
| tree | c18d00c7b02d5cf3176dfcdf41179b0ddd940b4e /perlsdio.h | |
| parent | f6c2d85bfbab1ff4d6196adc4caad35434546a3a (diff) | |
| download | perl-cf829ab07ccc67cf02ca41d6f870136b64d83833.tar.gz | |
Undo the SOCKS workarounds, instead start using PerlIO
if SOCKS is selected.
Subject: perl@7847, [ID 20001030.005], close-patch, perlio - The big cleanup
Date: Fri, 24 Nov 2000 18:31:30 +0100
Message-ID: <20001124183130.E28337@Strawberry.COM>
Subject: Re: perl@7847, [ID 20001030.005], close-patch, perlio - Patch the patch ...
From: Jens Hamisch <jens@Strawberry.COM>
Date: Fri, 24 Nov 2000 19:11:51 +0100
Message-ID: <20001124191151.A28753@Strawberry.COM>
p4raw-id: //depot/perl@7855
Diffstat (limited to 'perlsdio.h')
| -rw-r--r-- | perlsdio.h | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/perlsdio.h b/perlsdio.h index 7895d310b0..aaedec4541 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(aTHX_ 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(aTHX_ f) -# define PerlIO_ungetc(f,c) Perl_do_s64_ungetc(aTHX_ c,f) -# define PerlIO_read(f,buf,count) Perl_do_s64_fread(aTHX_ buf,count,f) -# define PerlIO_tell(f) Perl_do_s64_tell(aTHX_ 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,15 +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(aTHX_ 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 +# define PerlIO_seek(f,o,w) fseek(f,o,w) #endif #ifdef HAS_FGETPOS #define PerlIO_getpos(f,p) fgetpos(f,p) |