From: Nick Ing-Simmons Date: Thu, 2 May 2002 17:09:43 +0000 (+0000) Subject: *** EXPERIMENTAL *** X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=362d0d4483498690d9657a76e53755c85da3b796;p=p5sagit%2Fp5-mst-13.2.git *** EXPERIMENTAL *** Have perlsdio.h use the iperlsys.h aliases and see if that helps non-PERLIO IMP_SYS on Win32. (Miniperl okay on linux). p4raw-id: //depot/perlio@16350 --- diff --git a/iperlsys.h b/iperlsys.h index de45ff1..0dd5482 100644 --- a/iperlsys.h +++ b/iperlsys.h @@ -342,7 +342,7 @@ struct IPerlStdIOInfo #define PerlSIO_setlinebuf(f) setlinebuf(f) #define PerlSIO_printf Perl_fprintf_nocontext #define PerlSIO_stdoutf *PL_StdIO->pPrintf -#define PerlSIO_vprintf(f,fmt,a) +#define PerlSIO_vprintf(f,fmt,a) vfprintf(f,fmt,a) #define PerlSIO_ftell(f) ftell(f) #define PerlSIO_fseek(f,o,w) fseek(f,o,w) #define PerlSIO_fgetpos(f,p) fgetpos(f,p) @@ -809,7 +809,7 @@ struct IPerlMemInfo /* Shared memory macros */ #ifdef NETWARE - + #define PerlMemShared_malloc(size) \ (*PL_Mem->pMalloc)(PL_Mem, (size)) #define PerlMemShared_realloc(buf, size) \ diff --git a/perlsdio.h b/perlsdio.h index 72ae584..e78076d 100644 --- a/perlsdio.h +++ b/perlsdio.h @@ -18,23 +18,23 @@ * Make this as close to original stdio as possible. */ #define PerlIO FILE -#define PerlIO_stderr() stderr -#define PerlIO_stdout() stdout -#define PerlIO_stdin() stdin +#define PerlIO_stderr() PerlSIO_stderr +#define PerlIO_stdout() PerlSIO_stdout +#define PerlIO_stdin() PerlSIO_stdin #define PerlIO_isutf8(f) 0 -#define PerlIO_printf fprintf -#define PerlIO_stdoutf printf -#define PerlIO_vprintf(f,fmt,a) vfprintf(f,fmt,a) -#define PerlIO_write(f,buf,count) fwrite1(buf,1,count,f) +#define PerlIO_printf PerlSIO_printf +#define PerlIO_stdoutf PerlSIO_stdoutf +#define PerlIO_vprintf(f,fmt,a) PerlSIO_vprintf(f,fmt,a) +#define PerlIO_write(f,buf,count) PerlSIO_fwrite(buf,1,count,f) #define PerlIO_unread(f,buf,count) (-1) -#define PerlIO_open fopen -#define PerlIO_fdopen fdopen -#define PerlIO_reopen freopen -#define PerlIO_close(f) fclose(f) -#define PerlIO_puts(f,s) fputs(s,f) -#define PerlIO_putc(f,c) fputc(c,f) +#define PerlIO_open PerlSIO_fopen +#define PerlIO_fdopen PerlSIO_fdopen +#define PerlIO_reopen PerlSIO_freopen +#define PerlIO_close(f) PerlSIO_fclose(f) +#define PerlIO_puts(f,s) PerlSIO_fputs(f,s) +#define PerlIO_putc(f,c) PerlSIO_fputc(f,c) #if defined(VMS) # if defined(__DECC) /* Unusual definition of ungetc() here to accomodate fast_sv_gets()' @@ -57,26 +57,26 @@ (feof(f) ? 0 : (SSize_t)fread(buf,1,count,f)) # define PerlIO_tell(f) ftell(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) +# define PerlIO_getc(f) PerlSIO_fgetc(f) +# define PerlIO_ungetc(f,c) PerlSIO_ungetc(c,f) +# define PerlIO_read(f,buf,count) (SSize_t)PerlSIO_fread(buf,1,count,f) +# define PerlIO_tell(f) PerlSIO_ftell(f) #endif -#define PerlIO_eof(f) feof(f) +#define PerlIO_eof(f) PerlSIO_feof(f) #define PerlIO_getname(f,b) fgetname(f,b) -#define PerlIO_error(f) ferror(f) -#define PerlIO_fileno(f) fileno(f) -#define PerlIO_clearerr(f) clearerr(f) -#define PerlIO_flush(f) Fflush(f) +#define PerlIO_error(f) PerlSIO_ferror(f) +#define PerlIO_fileno(f) PerlSIO_fileno(f) +#define PerlIO_clearerr(f) PerlSIO_clearerr(f) +#define PerlIO_flush(f) PerlSIO_fflush(f) #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) +# define PerlIO_seek(f,o,w) PerlSIO_fseek(f,o,w) #endif -#define PerlIO_rewind(f) rewind(f) -#define PerlIO_tmpfile() tmpfile() +#define PerlIO_rewind(f) PerlSIO_rewind(f) +#define PerlIO_tmpfile() PerlSIO_tmpfile() #define PerlIO_importFILE(f,fl) (f) #define PerlIO_exportFILE(f,fl) (f) @@ -84,21 +84,21 @@ #define PerlIO_releaseFILE(p,f) ((void) 0) #ifdef HAS_SETLINEBUF -#define PerlIO_setlinebuf(f) setlinebuf(f); +#define PerlIO_setlinebuf(f) PerlSIO_setlinebuf(f); #else -#define PerlIO_setlinebuf(f) setvbuf(f, Nullch, _IOLBF, 0); +#define PerlIO_setlinebuf(f) PerlSIO_setvbuf(f, Nullch, _IOLBF, 0); #endif /* Now our interface to Configure's FILE_xxx macros */ #ifdef USE_STDIO_PTR #define PerlIO_has_cntptr(f) 1 -#define PerlIO_get_ptr(f) FILE_ptr(f) -#define PerlIO_get_cnt(f) FILE_cnt(f) +#define PerlIO_get_ptr(f) PerlSIO_get_ptr(f) +#define PerlIO_get_cnt(f) PerlSIO_get_cnt(f) #ifdef STDIO_CNT_LVALUE #define PerlIO_canset_cnt(f) 1 -#define PerlIO_set_cnt(f,c) (FILE_cnt(f) = (c)) +#define PerlIO_set_cnt(f,c) PerlSIO_set_cnt(f,c) #ifdef STDIO_PTR_LVALUE #ifdef STDIO_PTR_LVAL_NOCHANGE_CNT #define PerlIO_fast_gets(f) 1 @@ -111,11 +111,11 @@ #ifdef STDIO_PTR_LVALUE #ifdef STDIO_PTR_LVAL_NOCHANGE_CNT -#define PerlIO_set_ptrcnt(f,p,c) STMT_START {FILE_ptr(f) = (p), PerlIO_set_cnt(f,c);} STMT_END +#define PerlIO_set_ptrcnt(f,p,c) STMT_START {PerlSIO_set_ptr(f,p), PerlIO_set_cnt(f,c);} STMT_END #else #ifdef STDIO_PTR_LVAL_SETS_CNT /* assert() may pre-process to ""; potential syntax error (FILE_ptr(), ) */ -#define PerlIO_set_ptrcnt(f,p,c) STMT_START {FILE_ptr(f) = (p); assert(FILE_cnt(f) == (c));} STMT_END +#define PerlIO_set_ptrcnt(f,p,c) STMT_START {PerlSIO_set_ptr(f,p); assert(PerlSIO_get_cnt(f) == (c));} STMT_END #define PerlIO_fast_gets(f) 1 #else #define PerlIO_set_ptrcnt(f,p,c) abort() @@ -141,8 +141,8 @@ #ifdef FILE_base #define PerlIO_has_base(f) 1 -#define PerlIO_get_base(f) FILE_base(f) -#define PerlIO_get_bufsiz(f) FILE_bufsiz(f) +#define PerlIO_get_base(f) PerlSIO_get_base(f) +#define PerlIO_get_bufsiz(f) PerlSIO_get_bufsiz(f) #else #define PerlIO_has_base(f) 0 #define PerlIO_get_base(f) (abort(),(void *)0)