[gs-cvs] rev 8203 - branches/gs-ghostpdl-1.50/src

[giles at ghostscript.com]

Author: giles
Date: 2007-08-24 09:48:00 -0700 (Fri, 24 Aug 2007)
New Revision: 8203

Modified:
   branches/gs-ghostpdl-1.50/src/stdint_.h
   branches/gs-ghostpdl-1.50/src/unix-gcc.mak
Log:
Fix stdint.h related problems with the Cygwin build (gcc 3.4.4).

This corresponds to Ray's commit in trunk r8195.


Modified: branches/gs-ghostpdl-1.50/src/stdint_.h
===================================================================
--- branches/gs-ghostpdl-1.50/src/stdint_.h	2007-08-24 16:46:38 UTC (rev 8202)
+++ branches/gs-ghostpdl-1.50/src/stdint_.h	2007-08-24 16:48:00 UTC (rev 8203)
@@ -60,14 +60,6 @@
 # elif defined(__VMS) /* OpenVMS provides these types in inttypes.h */
 #  include <inttypes.h>
 #  define STDINT_TYPES_DEFINED
-# elif defined(__CYGWIN__)
-   /* Cygwin defines the signed versions in sys/types.h */
-   /* but uses a u_ prefix for the unsigned versions */
-   typedef u_int8_t                uint8_t;
-   typedef u_int16_t               uint16_t;
-   typedef u_int32_t               uint32_t;
-   typedef u_int64_t               uint64_t;
-#  define STDINT_TYPES_DEFINED
 # endif
    /* other archs may want to add defines here, 
       or use the fallbacks in std.h */

Modified: branches/gs-ghostpdl-1.50/src/unix-gcc.mak
===================================================================
--- branches/gs-ghostpdl-1.50/src/unix-gcc.mak	2007-08-24 16:46:38 UTC (rev 8202)
+++ branches/gs-ghostpdl-1.50/src/unix-gcc.mak	2007-08-24 16:48:00 UTC (rev 8203)
@@ -439,7 +439,7 @@
 
 CCFLAGS=$(GENOPT) $(CAPOPT) $(CFLAGS) -DGX_COLOR_INDEX_TYPE='unsigned long long'
 CC_=$(CC) `cat $(AK)` $(CCFLAGS)
-CCAUX=$(CC) `cat $(AK)`
+CCAUX=$(CC) `cat $(AK)` $(CFLAGS)
 # These are the specific warnings we have to turn off to compile those
 # specific few files that need this.  We may turn off others in the future.
 CC_NO_WARN=$(CC_) -Wno-cast-qual -Wno-traditional