back out change#1289 (additional pollution breaks things on win32)

p4raw-link: @1289 on //depot/perl: e031fa27bae468c1d1f1c2f63947de150db520aa

p4raw-id: //depot/perl@1308

diff --git a/win32/win32iop.h b/win32/win32iop.h
index a5021de..b22a187 100644 (file)
--- a/win32/win32iop.h
+++ b/win32/win32iop.h
@@ -165,8 +165,8 @@ END_EXTERN_C
 #define stderr                         win32_stderr()
 #define stdout                         win32_stdout()
 #define        stdin                           win32_stdin()
-#define feof                                   win32_feof
-#define ferror                         win32_ferror
+#define feof(f)                                win32_feof(f)
+#define ferror(f)                      win32_ferror(f)
 #define errno                          (*win32_errno())
 #define environ                                (*win32_environ())
 #define strerror                       win32_strerror
@@ -179,47 +179,47 @@ END_EXTERN_C
 #define        vfprintf                win32_vfprintf
 #define        printf                  win32_printf
 #define        vprintf                 win32_vprintf
-#define fread                          win32_fread
-#define fwrite                  win32_fwrite
+#define fread(buf,size,count,f)        win32_fread(buf,size,count,f)
+#define fwrite(buf,size,count,f)       win32_fwrite(buf,size,count,f)
 #define fopen                  win32_fopen
 #undef fdopen
 #define fdopen                 win32_fdopen
 #define freopen                        win32_freopen
-#define        fclose                  win32_fclose
-#define fputs                  win32_fputs
-#define fputc                  win32_fputc
-#define ungetc                 win32_ungetc
+#define        fclose(f)               win32_fclose(f)
+#define fputs(s,f)             win32_fputs(s,f)
+#define fputc(c,f)             win32_fputc(c,f)
+#define ungetc(c,f)            win32_ungetc(c,f)
 #undef getc
-#define getc                           win32_getc
-#define fileno                 win32_fileno
-#define clearerr               win32_clearerr
-#define fflush                 win32_fflush
-#define ftell                  win32_ftell
-#define fseek                  win32_fseek
-#define fgetpos                win32_fgetpos
-#define fsetpos                win32_fsetpos
-#define rewind                 win32_rewind
-#define tmpfile                win32_tmpfile
-#define abort                          win32_abort
-#define fstat                  win32_fstat
-#define stat                   win32_stat
-#define setmode                win32_setmode
-#define lseek                  win32_lseek
-#define tell                   win32_tell
-#define dup                    win32_dup
-#define dup2                   win32_dup2
+#define getc(f)                        win32_getc(f)
+#define fileno(f)              win32_fileno(f)
+#define clearerr(f)            win32_clearerr(f)
+#define fflush(f)              win32_fflush(f)
+#define ftell(f)               win32_ftell(f)
+#define fseek(f,o,w)           win32_fseek(f,o,w)
+#define fgetpos(f,p)           win32_fgetpos(f,p)
+#define fsetpos(f,p)           win32_fsetpos(f,p)
+#define rewind(f)              win32_rewind(f)
+#define tmpfile()              win32_tmpfile()
+#define abort()                        win32_abort()
+#define fstat(fd,bufptr)       win32_fstat(fd,bufptr)
+#define stat(pth,bufptr)       win32_stat(pth,bufptr)
+#define setmode(fd,mode)       win32_setmode(fd,mode)
+#define lseek(fd,offset,orig)  win32_lseek(fd,offset,orig)
+#define tell(fd)               win32_tell(fd)
+#define dup(fd)                        win32_dup(fd)
+#define dup2(fd1,fd2)          win32_dup2(fd1,fd2)
 #define open                   win32_open
-#define close                  win32_close
-#define eof                    win32_eof
-#define read                   win32_read
-#define write                  win32_write
+#define close(fd)              win32_close(fd)
+#define eof(fd)                        win32_eof(fd)
+#define read(fd,b,s)           win32_read(fd,b,s)
+#define write(fd,b,s)          win32_write(fd,b,s)
 #define _open_osfhandle                win32_open_osfhandle
 #define _get_osfhandle         win32_get_osfhandle
 #define spawnvp                        win32_spawnvp
 #define mkdir                  win32_mkdir
 #define rmdir                  win32_rmdir
 #define chdir                  win32_chdir
-#define flock                  win32_flock
+#define flock(fd,o)            win32_flock(fd,o)
 #define execv                  win32_execv
 #define execvp                 win32_execvp
 #define perror                 win32_perror