[gs-cvs] rev 7067 - trunk/gs/src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2006-09-22 10:42:33 -0700 (Fri, 22 Sep 2006)
New Revision: 7067

Modified:
   trunk/gs/src/gp.h
   trunk/gs/src/gp_iwatc.c
   trunk/gs/src/gp_macio.c
   trunk/gs/src/gp_mswin.c
   trunk/gs/src/gp_os2.c
   trunk/gs/src/gp_unifs.c
   trunk/gs/src/gp_vms.c
Log:
Change s/stream/strm/ to fix a MSVC 6 warning: C4224: nonstandard extension
used: formal parameter 'stream' was previously defined as a type.


Modified: trunk/gs/src/gp.h
===================================================================
--- trunk/gs/src/gp.h	2006-09-22 00:51:32 UTC (rev 7066)
+++ trunk/gs/src/gp.h	2006-09-22 17:42:33 UTC (rev 7067)
@@ -444,9 +444,9 @@
 			   const char *mode);
 FILE *gp_open_printer_64(char fname[gp_file_name_sizeof], int binary_mode);
 
-int64_t gp_ftell_64(FILE *stream);
+int64_t gp_ftell_64(FILE *strm);
 
-int gp_fseek_64(FILE *stream, int64_t offset, int origin);
+int gp_fseek_64(FILE *strm, int64_t offset, int origin);
 
 /* We don't define gp_fread_64, gp_fwrite_64,
    because (1) known platforms allow regular fread, fwrite

Modified: trunk/gs/src/gp_iwatc.c
===================================================================
--- trunk/gs/src/gp_iwatc.c	2006-09-22 00:51:32 UTC (rev 7066)
+++ trunk/gs/src/gp_iwatc.c	2006-09-22 17:42:33 UTC (rev 7067)
@@ -217,16 +217,16 @@
     return gp_open_printer(fname, binary_mode);
 }
 
-int64_t gp_ftell_64(FILE *stream)
+int64_t gp_ftell_64(FILE *strm)
 {
-    return ftell(stream);
+    return ftell(strm);
 }
 
-int gp_fseek_64(FILE *stream, int64_t offset, int origin)
+int gp_fseek_64(FILE *strm, int64_t offset, int origin)
 {
     long offset1 = (long)offset;
     
     if (offset != offset1)
 	return -1;
-    return fseek(stream, offset1, origin);
+    return fseek(strm, offset1, origin);
 }

Modified: trunk/gs/src/gp_macio.c
===================================================================
--- trunk/gs/src/gp_macio.c	2006-09-22 00:51:32 UTC (rev 7066)
+++ trunk/gs/src/gp_macio.c	2006-09-22 17:42:33 UTC (rev 7067)
@@ -1036,16 +1036,16 @@
     return gp_open_printer(fname, binary_mode);
 }
 
-int64_t gp_ftell_64(FILE *stream)
+int64_t gp_ftell_64(FILE *strm)
 {
-    return ftell(stream);
+    return ftell(strm);
 }
 
-int gp_fseek_64(FILE *stream, int64_t offset, int origin)
+int gp_fseek_64(FILE *strm, int64_t offset, int origin)
 {
     long offset1 = (long)offset;
     
     if (offset != offset1)
 	return -1;
-    return fseek(stream, offset1, origin);
+    return fseek(strm, offset1, origin);
 }

Modified: trunk/gs/src/gp_mswin.c
===================================================================
--- trunk/gs/src/gp_mswin.c	2006-09-22 00:51:32 UTC (rev 7066)
+++ trunk/gs/src/gp_mswin.c	2006-09-22 17:42:33 UTC (rev 7067)
@@ -826,28 +826,28 @@
     return gp_open_printer(fname, binary_mode);
 }
 
-int64_t gp_ftell_64(FILE *stream)
+int64_t gp_ftell_64(FILE *strm)
 {
 #if !defined(_MSC_VER)
-    return ftell(stream);
+    return ftell(strm);
 #elif _MSC_VER < 1400
-    return ftell(stream);
+    return ftell(strm);
 #else
-    return _ftelli64(stream);
+    return _ftelli64(strm);
 #endif
 }
 
-int gp_fseek_64(FILE *stream, int64_t offset, int origin)
+int gp_fseek_64(FILE *strm, int64_t offset, int origin)
 {
 #if !defined(_MSC_VER)
-    return fseek(stream, offset, origin);
+    return fseek(strm, offset, origin);
 #elif _MSC_VER < 1400
     long offset1 = (long)offset;
     
     if (offset != offset1)
 	return -1;
-    return fseek(stream, offset1, origin);
+    return fseek(strm, offset1, origin);
 #else
-    return _fseeki64(stream, offset, origin);
+    return _fseeki64(strm, offset, origin);
 #endif
 }

Modified: trunk/gs/src/gp_os2.c
===================================================================
--- trunk/gs/src/gp_os2.c	2006-09-22 00:51:32 UTC (rev 7066)
+++ trunk/gs/src/gp_os2.c	2006-09-22 17:42:33 UTC (rev 7067)
@@ -881,16 +881,16 @@
     return gp_open_printer(fname, binary_mode);
 }
 
-int64_t gp_ftell_64(FILE *stream)
+int64_t gp_ftell_64(FILE *strm)
 {
-    return ftell(stream);
+    return ftell(strm);
 }
 
-int gp_fseek_64(FILE *stream, int64_t offset, int origin)
+int gp_fseek_64(FILE *strm, int64_t offset, int origin)
 {
     long offset1 = (long)offset;
     
     if (offset != offset1)
 	return -1;
-    return fseek(stream, offset1, origin);
+    return fseek(strm, offset1, origin);
 }

Modified: trunk/gs/src/gp_unifs.c
===================================================================
--- trunk/gs/src/gp_unifs.c	2006-09-22 00:51:32 UTC (rev 7066)
+++ trunk/gs/src/gp_unifs.c	2006-09-22 17:42:33 UTC (rev 7067)
@@ -496,24 +496,24 @@
 
 /* gp_open_printer_64 is defined in gp_unix.h */
 
-int64_t gp_ftell_64(FILE *stream)
+int64_t gp_ftell_64(FILE *strm)
 {
 #ifdef _LARGEFILE64_SOURCE
-    return ftello(stream);
+    return ftello(strm);
 #else
-    return ftello64(stream);
+    return ftello64(strm);
 #endif
 }
 
-int gp_fseek_64(FILE *stream, int64_t offset, int origin)
+int gp_fseek_64(FILE *strm, int64_t offset, int origin)
 {
 #ifdef _LARGEFILE64_SOURCE
     long offset1 = (long)offset;
     
     if (offset != offset1)
 	return -1;
-    return fseeko(stream, offset1, origin);
+    return fseeko(strm, offset1, origin);
 #else
-    return fseeko64(stream, offset, origin);
+    return fseeko64(strm, offset, origin);
 #endif
 }

Modified: trunk/gs/src/gp_vms.c
===================================================================
--- trunk/gs/src/gp_vms.c	2006-09-22 00:51:32 UTC (rev 7066)
+++ trunk/gs/src/gp_vms.c	2006-09-22 17:42:33 UTC (rev 7067)
@@ -673,16 +673,16 @@
     return gp_open_printer(fname, binary_mode);
 }
 
-int64_t gp_ftell_64(FILE *stream)
+int64_t gp_ftell_64(FILE *strm)
 {
-    return ftell(stream);
+    return ftell(strm);
 }
 
-int gp_fseek_64(FILE *stream, int64_t offset, int origin)
+int gp_fseek_64(FILE *strm, int64_t offset, int origin)
 {
     long offset1 = (long)offset;
     
     if (offset != offset1)
 	return -1;
-    return fseek(stream, offset1, origin);
+    return fseek(strm, offset1, origin);
 }