[gs-cvs] rev 7866 - in trunk/gs: ijs src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-04-20 19:33:44 -0700 (Fri, 20 Apr 2007)
New Revision: 7866

Modified:
   trunk/gs/ijs/unistd_.h
   trunk/gs/src/dwdll.c
   trunk/gs/src/dwimg.h
   trunk/gs/src/dwsetup.cpp
   trunk/gs/src/gdevpdfe.c
   trunk/gs/src/gdevwpr2.c
   trunk/gs/src/gp_msprn.c
   trunk/gs/src/gp_mswin.c
   trunk/gs/src/iscannum.c
   trunk/gs/src/lib.mak
   trunk/gs/src/sfxstdio.c
   trunk/gs/src/windows_.h
Log:
Fix all warnings generated by MSVC 6 & 7 except the warnings matching
"C4018|C4244|jbig2dec|jasper" regular expression.

DIFFERENCES:
None


Modified: trunk/gs/ijs/unistd_.h
===================================================================
--- trunk/gs/ijs/unistd_.h	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/ijs/unistd_.h	2007-04-21 02:33:44 UTC (rev 7866)
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #define read(handle, buffer, count) _read(handle, buffer, count)
 #define write(handle, buffer, count) _write(handle, buffer, count)
+#define close(fd) _close(fd)
 #else
 #include <unistd.h>
 #endif

Modified: trunk/gs/src/dwdll.c
===================================================================
--- trunk/gs/src/dwdll.c	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/dwdll.c	2007-04-21 02:33:44 UTC (rev 7866)
@@ -37,7 +37,6 @@
 {
 char fullname[1024];
 char *p;
-long version;
 int length;
 gsapi_revision_t rv;
 

Modified: trunk/gs/src/dwimg.h
===================================================================
--- trunk/gs/src/dwimg.h	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/dwimg.h	2007-04-21 02:33:44 UTC (rev 7866)
@@ -78,6 +78,8 @@
 void image_delete(IMAGE *img);
 int image_size(IMAGE *img, int new_width, int new_height, int new_raster, 
    unsigned int new_format, void *pimage);
+int image_separation(IMAGE *img, int comp_num, const char *name,
+   unsigned short c, unsigned short m, unsigned short y, unsigned short k);
 
 /* GUI thread only */
 void image_open(IMAGE *img);

Modified: trunk/gs/src/dwsetup.cpp
===================================================================
--- trunk/gs/src/dwsetup.cpp	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/dwsetup.cpp	2007-04-21 02:33:44 UTC (rev 7866)
@@ -851,7 +851,6 @@
 
         /* Create lib/cidfmap */
 	if (g_bCJKFonts) {
-		FILE *f;
 		char szCIDFmap[MAXSTR];
 		char szCIDFmap_bak[MAXSTR];
 		char szGSPATH[MAXSTR];

Modified: trunk/gs/src/gdevpdfe.c
===================================================================
--- trunk/gs/src/gdevpdfe.c	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/gdevpdfe.c	2007-04-21 02:33:44 UTC (rev 7866)
@@ -345,7 +345,7 @@
     return 0;
 }
 
-private char dd[]={'\'', 0xEF, 0xBB, 0xBF, '\'', 0};
+static const char dd[]={'\'', '\357', '\273', '\277', '\'', 0};
 
 /* --------------------------------------------  */
 

Modified: trunk/gs/src/gdevwpr2.c
===================================================================
--- trunk/gs/src/gdevwpr2.c	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/gdevwpr2.c	2007-04-21 02:33:44 UTC (rev 7866)
@@ -878,7 +878,6 @@
     int orientation;
     int papersize;
     char papername[64];
-    char drvname[32];
     LPDEVMODE podevmode, pidevmode;
     HANDLE hprinter;
 

Modified: trunk/gs/src/gp_msprn.c
===================================================================
--- trunk/gs/src/gp_msprn.c	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/gp_msprn.c	2007-04-21 02:33:44 UTC (rev 7866)
@@ -179,7 +179,7 @@
     }
 
     /* start a thread to read the pipe */
-    tid = _beginthread(&mswin_printer_thread, 32768, pipeh[0]);
+    tid = _beginthread(&mswin_printer_thread, 32768, (void *)(pipeh[0]));
     if (tid == -1) {
 	fclose(*pfile);
 	close(pipeh[0]);

Modified: trunk/gs/src/gp_mswin.c
===================================================================
--- trunk/gs/src/gp_mswin.c	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/gp_mswin.c	2007-04-21 02:33:44 UTC (rev 7866)
@@ -204,8 +204,6 @@
 private int
 is_printer(const char *name)
 {
-    char buf[128];
-
     /* is printer if no name given */
     if (strlen(name) == 0)
 	return TRUE;

Modified: trunk/gs/src/iscannum.c
===================================================================
--- trunk/gs/src/iscannum.c	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/iscannum.c	2007-04-21 02:33:44 UTC (rev 7866)
@@ -315,7 +315,7 @@
     while (IS_DIGIT(d, c) || c == '-') {
 	/* Handle bogus '-' following '.' as in i2r above.	*/
 	if (c == '-') {
-	    if (scanner_options & SCAN_PDF_INV_NUM == 0)
+	    if ((scanner_options & SCAN_PDF_INV_NUM) == 0)
 		break;
 	    do {
 		GET_NEXT(c, sp, c = EOFC);

Modified: trunk/gs/src/lib.mak
===================================================================
--- trunk/gs/src/lib.mak	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/lib.mak	2007-04-21 02:33:44 UTC (rev 7866)
@@ -1192,7 +1192,7 @@
 	$(SETMOD) $(GLD)sfile $(sfile_)
 
 $(GLOBJ)sfxstdio.$(OBJ) : $(GLSRC)sfxstdio.c $(AK) $(stdio__h) $(memory__h)\
- $(gdebug_h) $(gpcheck_h) $(stream_h) $(strimpl_h)
+ $(unistd__h) $(gdebug_h) $(gpcheck_h) $(stream_h) $(strimpl_h)
 	$(GLCC) $(GLO_)sfxstdio.$(OBJ) $(C_) $(GLSRC)sfxstdio.c
 
 $(GLOBJ)sfxfd.$(OBJ) : $(GLSRC)sfxfd.c $(AK)\

Modified: trunk/gs/src/sfxstdio.c
===================================================================
--- trunk/gs/src/sfxstdio.c	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/sfxstdio.c	2007-04-21 02:33:44 UTC (rev 7866)
@@ -15,6 +15,7 @@
 /* File stream implementation using stdio */
 #include "stdio_.h"		/* includes std.h */
 #include "memory_.h"
+#include "unistd_.h"
 #include "gsmemory.h"
 #include "gdebug.h"
 #include "gpcheck.h"

Modified: trunk/gs/src/windows_.h
===================================================================
--- trunk/gs/src/windows_.h	2007-04-19 15:04:51 UTC (rev 7865)
+++ trunk/gs/src/windows_.h	2007-04-21 02:33:44 UTC (rev 7866)
@@ -19,6 +19,7 @@
 
 #define STRICT
 #include <windows.h>
+#include <process.h>
 
 #ifdef __WATCOMC__
 typedef RGBQUAD FAR * LPRGBQUAD;