[gs-cvs] rev 8461 - trunk/gs/src
giles at ghostscript.com
giles at ghostscript.com
Fri Dec 21 18:05:38 PST 2007
Author: giles
Date: 2007-12-21 18:05:36 -0800 (Fri, 21 Dec 2007)
New Revision: 8461
Modified:
trunk/gs/src/devs.mak
trunk/gs/src/gdevpcfb.c
trunk/gs/src/gdevsvga.c
trunk/gs/src/gscie.h
trunk/gs/src/gsmisc.c
trunk/gs/src/gxfarith.h
trunk/gs/src/gxpcopy.c
trunk/gs/src/lib.mak
trunk/gs/src/sidscale.c
trunk/gs/src/siscale.c
trunk/gs/src/std.h
Log:
Include gconfigv.h in std.h so defines like USE_FPU are more
consistently defined.
Modified: trunk/gs/src/devs.mak
===================================================================
--- trunk/gs/src/devs.mak 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/devs.mak 2007-12-22 02:05:36 UTC (rev 8461)
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2006 Artifex Software, Inc.
+# Copyright (C) 2001-2007 Artifex Software, Inc.
# All Rights Reserved.
#
# This software is provided AS-IS with no warranty, either express or
@@ -319,7 +319,7 @@
# Common code for MS-DOS and SCO.
#**************** $(CCD) gdevpcfb.c
-$(GLOBJ)gdevpcfb.$(OBJ) : $(GLSRC)gdevpcfb.c $(GDEV) $(memory__h) $(gconfigv_h)\
+$(GLOBJ)gdevpcfb.$(OBJ) : $(GLSRC)gdevpcfb.c $(GDEV) $(memory__h)\
$(gdevpccm_h) $(gdevpcfb_h) $(gsparam_h)
$(GLCC) $(GLO_)gdevpcfb.$(OBJ) $(C_) $(GLSRC)gdevpcfb.c
@@ -349,7 +349,7 @@
SVGA=$(GLOBJ)gdevsvga.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ) $(PCFBASM)
#**************** $(CCD) gdevsvga.c
-$(GLOBJ)gdevsvga.$(OBJ) : $(GLSRC)gdevsvga.c $(GDEV) $(memory__h) $(gconfigv_h)\
+$(GLOBJ)gdevsvga.$(OBJ) : $(GLSRC)gdevsvga.c $(GDEV) $(memory__h)\
$(gsparam_h) $(gxarith_h) $(gdevpccm_h) $(gdevpcfb_h) $(gdevsvga_h)
$(GLCC) $(GLO_)gdevsvga.$(OBJ) $(C_) $(GLSRC)gdevsvga.c
Modified: trunk/gs/src/gdevpcfb.c
===================================================================
--- trunk/gs/src/gdevpcfb.c 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/gdevpcfb.c 2007-12-22 02:05:36 UTC (rev 8461)
@@ -14,7 +14,6 @@
/* $Id$ */
/* IBM PC frame buffer (EGA/VGA) drivers */
#include "memory_.h"
-#include "gconfigv.h" /* for USE_ASM */
#include "gx.h"
#include "gserrors.h"
#include "gsparam.h"
Modified: trunk/gs/src/gdevsvga.c
===================================================================
--- trunk/gs/src/gdevsvga.c 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/gdevsvga.c 2007-12-22 02:05:36 UTC (rev 8461)
@@ -14,7 +14,6 @@
/* $Id$ */
/* SuperVGA display drivers */
#include "memory_.h"
-#include "gconfigv.h" /* for USE_ASM */
#include "gx.h"
#include "gserrors.h"
#include "gxarith.h" /* for ...log2 */
Modified: trunk/gs/src/gscie.h
===================================================================
--- trunk/gs/src/gscie.h 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/gscie.h 2007-12-22 02:05:36 UTC (rev 8461)
@@ -18,7 +18,7 @@
#ifndef gscie_INCLUDED
# define gscie_INCLUDED
-#include "gconfigv.h" /* for USE_FPU */
+#include "std.h" /* for USE_FPU */
#include "gsrefct.h"
#include "gsstype.h" /* for extern_st */
#include "gstypes.h" /* for gs_range_t */
Modified: trunk/gs/src/gsmisc.c
===================================================================
--- trunk/gs/src/gsmisc.c 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/gsmisc.c 2007-12-22 02:05:36 UTC (rev 8461)
@@ -52,7 +52,6 @@
#include "gpcheck.h" /* for gs_return_check_interrupt */
#include "gserror.h" /* for prototype */
#include "gserrors.h"
-#include "gconfigv.h" /* for USE_ASM */
#include "gxfarith.h"
#include "gxfixed.h"
#include "stdint_.h"
Modified: trunk/gs/src/gxfarith.h
===================================================================
--- trunk/gs/src/gxfarith.h 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/gxfarith.h 2007-12-22 02:05:36 UTC (rev 8461)
@@ -17,7 +17,7 @@
#ifndef gxfarith_INCLUDED
# define gxfarith_INCLUDED
-#include "gconfigv.h" /* for USE_FPU */
+#include "std.h" /* for USE_FPU */
#include "gxarith.h"
/*
Modified: trunk/gs/src/gxpcopy.c
===================================================================
--- trunk/gs/src/gxpcopy.c 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/gxpcopy.c 2007-12-22 02:05:36 UTC (rev 8461)
@@ -16,7 +16,6 @@
#include "math_.h"
#include "gx.h"
#include "gserrors.h"
-#include "gconfigv.h" /* for USE_FPU */
#include "gxfixed.h"
#include "gxfarith.h"
#include "gxistate.h" /* for access to line params */
Modified: trunk/gs/src/lib.mak
===================================================================
--- trunk/gs/src/lib.mak 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/lib.mak 2007-12-22 02:05:36 UTC (rev 8461)
@@ -48,7 +48,6 @@
arch_h=$(GLGEN)arch.h
stdpn_h=$(GLSRC)stdpn.h
stdpre_h=$(GLSRC)stdpre.h $(stdpn_h)
-std_h=$(GLSRC)std.h $(arch_h) $(stdpre_h)
stdint__h=$(GLSRC)stdint_.h $(std_h)
$(GLGEN)arch.h : $(GENARCH_XE)
@@ -73,6 +72,8 @@
gconfigv_h=$(GLGEN)gconfigv.h
gscdefs_h=$(GLSRC)gscdefs.h $(gconfigv_h)
+std_h=$(GLSRC)std.h $(arch_h) $(stdpre_h) $(gconfigv_h)
+
# C library interfaces
# Because of variations in the "standard" header files between systems, and
@@ -150,7 +151,7 @@
gsutil_h=$(GLSRC)gsutil.h
gxarith_h=$(GLSRC)gxarith.h
gxbitmap_h=$(GLSRC)gxbitmap.h $(gsbitmap_h) $(gstypes_h)
-gxfarith_h=$(GLSRC)gxfarith.h $(gconfigv_h) $(gxarith_h)
+gxfarith_h=$(GLSRC)gxfarith.h $(std_h) $(gxarith_h)
gxfixed_h=$(GLSRC)gxfixed.h
gxobj_h=$(GLSRC)gxobj.h $(gxbitmap_h)
gxrplane_h=$(GLSRC)gxrplane.h
@@ -250,7 +251,7 @@
$(GLCC) $(GLO_)gsfemu.$(OBJ) $(C_) $(GLSRC)gsfemu.c
$(GLOBJ)gsmisc.$(OBJ) : $(GLSRC)gsmisc.c $(GXERR)\
- $(gconfigv_h) $(std_h) $(vmsmath_h)\
+ $(vmsmath_h)\
$(ctype__h) $(malloc__h) $(math__h) $(memory__h) $(string__h)\
$(gpcheck_h) $(gserror_h) $(gxfarith_h) $(gxfixed_h) $(stdint__h)
$(GLCC) $(GLO_)gsmisc.$(OBJ) $(C_) $(GLSRC)gsmisc.c
@@ -420,7 +421,7 @@
$(gxftype_h)
gxiparam_h=$(GLSRC)gxiparam.h $(gsstype_h) $(gxdevcli_h)
gximask_h=$(GLSRC)gximask.h $(gxibitmap_h) $(gsropt_h)
-gscie_h=$(GLSRC)gscie.h $(gconfigv_h) $(gsrefct_h) $(gsstype_h) $(gstypes_h) $(gxctable_h)
+gscie_h=$(GLSRC)gscie.h $(std_h) $(gsrefct_h) $(gsstype_h) $(gstypes_h) $(gxctable_h)
gsicc_h=$(GLSRC)gsicc.h $(gscie_h)
gscrd_h=$(GLSRC)gscrd.h $(gscie_h)
gscrdp_h=$(GLSRC)gscrdp.h $(gscie_h) $(gsparam_h)
@@ -698,7 +699,7 @@
$(gspath_h) $(gsstruct_h) $(gxfixed_h) $(gxarith_h) $(gzpath_h)
$(GLCC) $(GLO_)gxpath2.$(OBJ) $(C_) $(GLSRC)gxpath2.c
-$(GLOBJ)gxpcopy.$(OBJ) : $(GLSRC)gxpcopy.c $(GXERR) $(math__h) $(gconfigv_h)\
+$(GLOBJ)gxpcopy.$(OBJ) : $(GLSRC)gxpcopy.c $(GXERR) $(math__h) \
$(gxfarith_h) $(gxfixed_h) $(gxistate_h) $(gzpath_h) $(vdtrace_h)
$(GLCC) $(GLO_)gxpcopy.$(OBJ) $(C_) $(GLSRC)gxpcopy.c
@@ -1776,14 +1777,12 @@
$(GLCC) $(GLO_)siinterp.$(OBJ) $(C_) $(GLSRC)siinterp.c
$(GLOBJ)siscale.$(OBJ) : $(GLSRC)siscale.c $(AK)\
- $(math__h) $(memory__h) $(stdio__h)\
- $(gconfigv_h) $(gdebug_h)\
+ $(math__h) $(memory__h) $(stdio__h) $(gdebug_h)\
$(siscale_h) $(strimpl_h)
$(GLCC) $(GLO_)siscale.$(OBJ) $(C_) $(GLSRC)siscale.c
$(GLOBJ)sidscale.$(OBJ) : $(GLSRC)sidscale.c $(AK)\
- $(math__h) $(memory__h) $(stdio__h)\
- $(gconfigv_h) $(gdebug_h)\
+ $(math__h) $(memory__h) $(stdio__h) $(gdebug_h)\
$(sidscale_h) $(strimpl_h)
$(GLCC) $(GLO_)sidscale.$(OBJ) $(C_) $(GLSRC)sidscale.c
Modified: trunk/gs/src/sidscale.c
===================================================================
--- trunk/gs/src/sidscale.c 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/sidscale.c 2007-12-22 02:05:36 UTC (rev 8461)
@@ -16,7 +16,6 @@
#include "math_.h"
#include "memory_.h"
#include "stdio_.h"
-#include "gconfigv.h"
#include "gdebug.h"
#include "gxfixed.h" /* for gxdda.h */
#include "gxdda.h"
Modified: trunk/gs/src/siscale.c
===================================================================
--- trunk/gs/src/siscale.c 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/siscale.c 2007-12-22 02:05:36 UTC (rev 8461)
@@ -16,7 +16,6 @@
#include "math_.h"
#include "memory_.h"
#include "stdio_.h"
-#include "gconfigv.h"
#include "gdebug.h"
#include "strimpl.h"
#include "siscale.h"
Modified: trunk/gs/src/std.h
===================================================================
--- trunk/gs/src/std.h 2007-12-22 00:19:36 UTC (rev 8460)
+++ trunk/gs/src/std.h 2007-12-22 02:05:36 UTC (rev 8461)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+/* Copyright (C) 2001-2007 Artifex Software, Inc.
All Rights Reserved.
This software is provided AS-IS with no warranty, either express or
@@ -22,6 +22,9 @@
/* Include the architecture definitions. */
#include "arch.h"
+/* Include compile time constants from the makefile */
+#include "gconfigv.h"
+
/*
* Define lower-case versions of the architecture parameters for backward
* compatibility.
More information about the gs-cvs
mailing list