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

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-07-01 10:18:18 -0700 (Sun, 01 Jul 2007)
New Revision: 8094

Modified:
   trunk/gs/src/int.mak
   trunk/gs/src/zfile.c
   trunk/gs/src/zfproc.c
   trunk/gs/src/zimage.c
   trunk/gs/src/ztoken.c
   trunk/gs/src/zvmem.c
Log:
Include the system headers first to avoid name conflict between Cygwin
headers and a Ghostscript macro. This works because (1) we don't use
the affected structure, (2) system header files are protected from double
inclusion. Bug 689276.

DIFFERENCES:
None

Modified: trunk/gs/src/int.mak
===================================================================
--- trunk/gs/src/int.mak	2007-06-30 23:46:18 UTC (rev 8093)
+++ trunk/gs/src/int.mak	2007-07-01 17:18:18 UTC (rev 8094)
@@ -317,7 +317,7 @@
 	$(PSCC) $(PSO_)zdict.$(OBJ) $(C_) $(PSSRC)zdict.c
 
 $(PSOBJ)zfile.$(OBJ) : $(PSSRC)zfile.c $(OP)\
- $(memory__h) $(string__h) $(unistd__h) $(gp_h) $(gpmisc_h)\
+ $(memory__h) $(string__h) $(unistd__h) $(stat__h) $(gp_h) $(gpmisc_h)\
  $(gscdefs_h) $(gsfname_h) $(gsstruct_h) $(gsutil_h) $(gxalloc_h) $(gxiodev_h)\
  $(dstack_h) $(estack_h) $(files_h)\
  $(ialloc_h) $(idict_h) $(ilevel_h) $(iname_h) $(iutil_h)\
@@ -341,7 +341,7 @@
  $(sfilter_h) $(srlx_h) $(sstring_h) $(stream_h) $(strimpl_h)
 	$(PSCC) $(PSO_)zfilter.$(OBJ) $(C_) $(PSSRC)zfilter.c
 
-$(PSOBJ)zfproc.$(OBJ) : $(PSSRC)zfproc.c $(GH) $(memory__h)\
+$(PSOBJ)zfproc.$(OBJ) : $(PSSRC)zfproc.c $(GH) $(memory__h) $(stat__h)\
  $(oper_h)\
  $(estack_h) $(files_h) $(gsstruct_h) $(ialloc_h) $(ifilter_h) $(istruct_h)\
  $(store_h) $(stream_h) $(strimpl_h)
@@ -401,7 +401,7 @@
  $(ialloc_h) $(ivmspace_h) $(oper_h) $(store_h)
 	$(PSCC) $(PSO_)zsysvm.$(OBJ) $(C_) $(PSSRC)zsysvm.c
 
-$(PSOBJ)ztoken.$(OBJ) : $(PSSRC)ztoken.c $(OP) $(string__h)\
+$(PSOBJ)ztoken.$(OBJ) : $(PSSRC)ztoken.c $(OP) $(string__h) $(stat__h)\
  $(gsstruct_h)\
  $(dstack_h) $(estack_h) $(files_h)\
  $(idict_h) $(iname_h) $(iscan_h) $(itoken_h)\
@@ -415,7 +415,7 @@
  $(iscan_h) $(iutil_h) $(sfilter_h) $(store_h) $(stream_h) $(strimpl_h)
 	$(PSCC) $(PSO_)ztype.$(OBJ) $(C_) $(PSSRC)ztype.c
 
-$(PSOBJ)zvmem.$(OBJ) : $(PSSRC)zvmem.c $(OP)\
+$(PSOBJ)zvmem.$(OBJ) : $(PSSRC)zvmem.c $(OP) $(stat__h)\
  $(dstack_h) $(estack_h) $(files_h)\
  $(ialloc_h) $(idict_h) $(igstate_h) $(isave_h) $(store_h) $(stream_h)\
  $(gsmalloc_h) $(gsmatrix_h) $(gsstate_h) $(gsstruct_h)
@@ -482,7 +482,7 @@
  $(ialloc_h) $(estack_h) $(igstate_h) $(iht_h) $(store_h)
 	$(PSCC) $(PSO_)zht.$(OBJ) $(C_) $(PSSRC)zht.c
 
-$(PSOBJ)zimage.$(OBJ) : $(PSSRC)zimage.c $(OP) $(memory__h)\
+$(PSOBJ)zimage.$(OBJ) : $(PSSRC)zimage.c $(OP) $(math__h) $(memory__h) $(stat__h)\
  $(gscspace_h) $(gscssub_h) $(gsimage_h) $(gsmatrix_h) $(gsstruct_h)\
  $(gxiparam_h)\
  $(estack_h) $(ialloc_h) $(ifilter_h) $(igstate_h) $(iimage_h) $(ilevel_h)\

Modified: trunk/gs/src/zfile.c
===================================================================
--- trunk/gs/src/zfile.c	2007-06-30 23:46:18 UTC (rev 8093)
+++ trunk/gs/src/zfile.c	2007-07-01 17:18:18 UTC (rev 8094)
@@ -16,6 +16,7 @@
 #include "memory_.h"
 #include "string_.h"
 #include "unistd_.h"
+#include "stat_.h" /* get system header early to avoid name clash on Cygwin */
 #include "ghost.h"
 #include "gscdefs.h"		/* for gx_io_device_table */
 #include "gsutil.h"		/* for bytes_compare */

Modified: trunk/gs/src/zfproc.c
===================================================================
--- trunk/gs/src/zfproc.c	2007-06-30 23:46:18 UTC (rev 8093)
+++ trunk/gs/src/zfproc.c	2007-07-01 17:18:18 UTC (rev 8094)
@@ -14,6 +14,7 @@
 /* $Id$ */
 /* Procedure-based filter stream support */
 #include "memory_.h"
+#include "stat_.h" /* get system header early to avoid name clash on Cygwin */
 #include "ghost.h"
 #include "oper.h"		/* for ifilter.h */
 #include "estack.h"

Modified: trunk/gs/src/zimage.c
===================================================================
--- trunk/gs/src/zimage.c	2007-06-30 23:46:18 UTC (rev 8093)
+++ trunk/gs/src/zimage.c	2007-07-01 17:18:18 UTC (rev 8094)
@@ -15,6 +15,7 @@
 /* Image operators */
 #include "math_.h"
 #include "memory_.h"
+#include "stat_.h" /* get system header early to avoid name clash on Cygwin */
 #include "ghost.h"
 #include "oper.h"
 #include "gscolor.h"

Modified: trunk/gs/src/ztoken.c
===================================================================
--- trunk/gs/src/ztoken.c	2007-06-30 23:46:18 UTC (rev 8093)
+++ trunk/gs/src/ztoken.c	2007-07-01 17:18:18 UTC (rev 8094)
@@ -14,6 +14,7 @@
 /* $Id$ */
 /* Token reading operators */
 #include "string_.h"
+#include "stat_.h" /* get system header early to avoid name clash on Cygwin */
 #include "ghost.h"
 #include "oper.h"
 #include "dstack.h"		/* for dict_find_name */

Modified: trunk/gs/src/zvmem.c
===================================================================
--- trunk/gs/src/zvmem.c	2007-06-30 23:46:18 UTC (rev 8093)
+++ trunk/gs/src/zvmem.c	2007-07-01 17:18:18 UTC (rev 8094)
@@ -13,6 +13,7 @@
 
 /* $Id$ */
 /* "Virtual memory" operators */
+#include "stat_.h" /* get system header early to avoid name clash on Cygwin */
 #include "ghost.h"
 #include "gsstruct.h"
 #include "oper.h"