[gs-cvs] rev 8471 - in trunk/gs: src toolbin
giles at ghostscript.com
giles at ghostscript.com
Mon Dec 31 17:30:53 PST 2007
Author: giles
Date: 2007-12-31 17:30:52 -0800 (Mon, 31 Dec 2007)
New Revision: 8471
Modified:
trunk/gs/src/gs.mak
trunk/gs/src/gscdef.c
trunk/gs/src/gscdefs.h
trunk/gs/src/openvms.mak
trunk/gs/src/openvms.mmk
trunk/gs/src/os2.mak
trunk/gs/src/unix-end.mak
trunk/gs/src/wctail.mak
trunk/gs/src/winlib.mak
trunk/gs/toolbin/msvcxml.bat
Log:
Remove the SYSTEM_CONSTANTS_ARE_WRITABLE compile-time define.
Details:
This was added so a particular application could rewrite the product name,
version, etc. after loading the library. We're not aware of anyone still
using the feature, and if so they can just change the source, which is
more appropriate in any case.
Also, remove USE_ASM from the msvc project file.
Modified: trunk/gs/src/gs.mak
===================================================================
--- trunk/gs/src/gs.mak 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/src/gs.mak 2008-01-01 01:30:52 UTC (rev 8471)
@@ -155,10 +155,6 @@
# table should have a capacity of 2^(16+N) names. This normally
# should be set to 0 (or left undefined), since non-zero values
# result in a larger fixed space overhead and slightly slower code.
-# SYSTEM_CONSTANTS_ARE_WRITABLE - normally 0 (or undefined); if set to
-# 1, makes the system configuration constants (buildtime, copyright,
-# product, revision, revisiondate, serialnumber) writable. Only
-# one unusual application needs this.
#
# It is very unlikely that anyone would want to edit the remaining
# symbols, but we describe them here for completeness:
Modified: trunk/gs/src/gscdef.c
===================================================================
--- trunk/gs/src/gscdef.c 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/src/gscdef.c 2008-01-01 01:30:52 UTC (rev 8471)
@@ -27,25 +27,25 @@
# define GS_BUILDTIME\
0 /* should be set in the makefile */
#endif
-CONFIG_CONST long gs_buildtime = GS_BUILDTIME;
+const long gs_buildtime = GS_BUILDTIME;
#ifndef GS_COPYRIGHT
# define GS_COPYRIGHT\
"Copyright (C) 2007 Artifex Software, Inc. All rights reserved."
#endif
-const char *CONFIG_CONST gs_copyright = GS_COPYRIGHT;
+const char *const gs_copyright = GS_COPYRIGHT;
#ifndef GS_PRODUCTFAMILY
# define GS_PRODUCTFAMILY\
"GPL Ghostscript"
#endif
-const char *CONFIG_CONST gs_productfamily = GS_PRODUCTFAMILY;
+const char *const gs_productfamily = GS_PRODUCTFAMILY;
#ifndef GS_PRODUCT
# define GS_PRODUCT\
GS_PRODUCTFAMILY " SVN PRE-RELEASE"
#endif
-const char *CONFIG_CONST gs_product = GS_PRODUCT;
+const char *const gs_product = GS_PRODUCT;
const char *
gs_program_name(void)
@@ -54,7 +54,7 @@
}
/* GS_REVISION must be defined in the makefile. */
-CONFIG_CONST long gs_revision = GS_REVISION;
+const long gs_revision = GS_REVISION;
long
gs_revision_number(void)
@@ -63,13 +63,13 @@
}
/* GS_REVISIONDATE must be defined in the makefile. */
-CONFIG_CONST long gs_revisiondate = GS_REVISIONDATE;
+const long gs_revisiondate = GS_REVISIONDATE;
#ifndef GS_SERIALNUMBER
# define GS_SERIALNUMBER\
42 /* a famous number */
#endif
-CONFIG_CONST long gs_serialnumber = GS_SERIALNUMBER;
+const long gs_serialnumber = GS_SERIALNUMBER;
/* ---------------- Installation directories and files ---------------- */
Modified: trunk/gs/src/gscdefs.h
===================================================================
--- trunk/gs/src/gscdefs.h 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/src/gscdefs.h 2008-01-01 01:30:52 UTC (rev 8471)
@@ -27,23 +27,15 @@
*/
/* Miscellaneous system constants (read-only systemparams). */
-/* They should all be const, but one application needs some of them */
-/* to be writable.... */
-#if SYSTEM_CONSTANTS_ARE_WRITABLE
-# define CONFIG_CONST /* */
-#else
-# define CONFIG_CONST const
-#endif
+extern const long gs_buildtime;
+extern const char *const gs_copyright;
+extern const char *const gs_product;
+extern const char *const gs_productfamily;
+extern const long gs_revision;
+extern const long gs_revisiondate;
+extern const long gs_serialnumber;
-extern CONFIG_CONST long gs_buildtime;
-extern const char *CONFIG_CONST gs_copyright;
-extern const char *CONFIG_CONST gs_product;
-extern const char *CONFIG_CONST gs_productfamily;
-extern CONFIG_CONST long gs_revision;
-extern CONFIG_CONST long gs_revisiondate;
-extern CONFIG_CONST long gs_serialnumber;
-
/* Installation directories and files */
extern const char *const gs_doc_directory;
extern const char *const gs_lib_default_path;
Modified: trunk/gs/src/openvms.mak
===================================================================
--- trunk/gs/src/openvms.mak 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/src/openvms.mak 2008-01-01 01:30:52 UTC (rev 8471)
@@ -293,10 +293,6 @@
EXTEND_NAMES=0
-# Define whether the system constants are writable.
-
-SYSTEM_CONSTANTS_ARE_WRITABLE=0
-
# Define the platform name.
PLATFORM=openvms_
@@ -553,4 +549,3 @@
$(gconfigv_h) : $(TOP_MAKEFILES) $(ECHOGS_XE)
$(EXP)$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define "USE_FPU" 1
$(EXP)$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define "EXTEND_NAMES" 0$(EXTEND_NAMES)
- $(EXP)$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define "SYSTEM_CONSTANTS_ARE_WRITABLE" 0$(SYSTEM_CONSTANTS_ARE_WRITABLE)
Modified: trunk/gs/src/openvms.mmk
===================================================================
--- trunk/gs/src/openvms.mmk 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/src/openvms.mmk 2008-01-01 01:30:52 UTC (rev 8471)
@@ -310,10 +310,6 @@
EXTEND_NAMES=0
-# Define whether the system constants are writable.
-
-SYSTEM_CONSTANTS_ARE_WRITABLE=0
-
# Define the platform name.
PLATFORM=openvms_
@@ -561,4 +557,3 @@
$(gconfigv_h) : $(TOP_MAKEFILES) $(ECHOGS_XE)
$(EXP)$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define "USE_FPU" 1
$(EXP)$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define "EXTEND_NAMES" 0$(EXTEND_NAMES)
- $(EXP)$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define "SYSTEM_CONSTANTS_ARE_WRITABLE" 0$(SYSTEM_CONSTANTS_ARE_WRITABLE)
Modified: trunk/gs/src/os2.mak
===================================================================
--- trunk/gs/src/os2.mak 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/src/os2.mak 2008-01-01 01:30:52 UTC (rev 8471)
@@ -603,7 +603,6 @@
$(gconfigv_h): $(PSSRCDIR)\os2.mak $(TOP_MAKEFILES) $(ECHOGS_XE)
$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define USE_FPU -x 2028 -q $(FPU_TYPE)-0 -x 29
$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define EXTEND_NAMES 0$(EXTEND_NAMES)
- $(ECHOGS_XE) -a $(gconfigv_h) -x 23 define SYSTEM_CONSTANTS_ARE_WRITABLE 0$(SYSTEM_CONSTANTS_ARE_WRITABLE)
# ----------------------------- Main program ------------------------------ #
Modified: trunk/gs/src/unix-end.mak
===================================================================
--- trunk/gs/src/unix-end.mak 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/src/unix-end.mak 2008-01-01 01:30:52 UTC (rev 8471)
@@ -66,7 +66,6 @@
$(gconfigv_h): $(GLSRC)unix-end.mak $(TOP_MAKEFILES) $(ECHOGS_XE)
$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define USE_FPU -x 2028 -q $(FPU_TYPE)-0 -x 29
$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define EXTEND_NAMES 0$(EXTEND_NAMES)
- $(ECHOGS_XE) -a $(gconfigv_h) -x 23 define SYSTEM_CONSTANTS_ARE_WRITABLE 0$(SYSTEM_CONSTANTS_ARE_WRITABLE)
# Emacs tags maintenance.
Modified: trunk/gs/src/wctail.mak
===================================================================
--- trunk/gs/src/wctail.mak 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/src/wctail.mak 2008-01-01 01:30:52 UTC (rev 8471)
@@ -87,4 +87,3 @@
$(gconfigv_h): $(WCTAIL_MAK) $(TOP_MAKEFILES) $(ECHOGS_XE)
$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define USE_FPU -x 2028 -q $(FPU_TYPE)-0 -x 29
$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define EXTEND_NAMES 0$(EXTEND_NAMES)
- $(ECHOGS_XE) -a $(gconfigv_h) -x 23 define SYSTEM_CONSTANTS_ARE_WRITABLE 0$(SYSTEM_CONSTANTS_ARE_WRITABLE)
Modified: trunk/gs/src/winlib.mak
===================================================================
--- trunk/gs/src/winlib.mak 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/src/winlib.mak 2008-01-01 01:30:52 UTC (rev 8471)
@@ -132,7 +132,6 @@
$(gconfigv_h): $(TOP_MAKEFILES) $(ECHOGS_XE)
$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define USE_FPU -x 2028 -q $(FPU_TYPE)-0 -x 29
$(ECHOGS_XE) -a $(gconfigv_h) -x 23 define EXTEND_NAMES 0$(EXTEND_NAMES)
- $(ECHOGS_XE) -a $(gconfigv_h) -x 23 define SYSTEM_CONSTANTS_ARE_WRITABLE 0$(SYSTEM_CONSTANTS_ARE_WRITABLE)
# -------------------------------- Library -------------------------------- #
Modified: trunk/gs/toolbin/msvcxml.bat
===================================================================
--- trunk/gs/toolbin/msvcxml.bat 2007-12-31 22:46:50 UTC (rev 8470)
+++ trunk/gs/toolbin/msvcxml.bat 2008-01-01 01:30:52 UTC (rev 8471)
@@ -86,7 +86,7 @@
echo ^>
echo ^<Tool
echo Name="VCPreBuildEventTool"
-echo CommandLine="$(OutDir)\echogs -wb $(IntDir)\gswin.ico -n -X -r $(SolutionDir)src\gswin.icx
$(OutDir)\echogs -w $(IntDir)\gconfig_.h -x 2f2a20 This file deliberately left blank. -x 2a2f
$(OutDir)\echogs -w $(IntDir)\gconfigv.h -x 23 define USE_ASM -x 2028 -q $(USE_ASM)-0 -x 29
$(OutDir)\echogs -a $(IntDir)\gconfigv.h -x 23 define USE_FPU -x 2028 -q $(FPU_TYPE)-0 -x 29
$(OutDir)\echogs -a $(IntDir)\gconfigv.h -x 23 define EXTEND_NAMES 0$(EXTEND_NAMES)
$(OutDir)\echogs -a $(IntDir)\gconfigv.h -x 23 define SYSTEM_CONSTANTS_ARE_WRITABLE 0
$(OutDir)\echogs -w $(IntDir)\jconfig.h -+R $(SolutionDir)src\stdpn.h -+R $(SolutionDir)src\stdpre.h -+R $(SolutionDir)src\gsjconf.h
copy $(SolutionDir)src\gsjmorec.h $(IntDir)\jmorecfg.h
copy $(SolutionDir)jpeg\jmorecfg.h $(IntDir)\jmcorig.h
copy $(SolutionDir)jpeg\jpeglib.h $(IntDir)\jpeglib_.h
copy $(SolutionDir)src\gscdef.c $(IntDir)\gscdefs.c
"
+echo CommandLine="$(OutDir)\echogs -wb $(IntDir)\gswin.ico -n -X -r $(SolutionDir)src\gswin.icx
$(OutDir)\echogs -w $(IntDir)\gconfig_.h -x 2f2a20 This file deliberately left blank. -x 2a2f
$(OutDir)\echogs -a $(IntDir)\gconfigv.h -x 23 define USE_FPU -x 2028 -q $(FPU_TYPE)-0 -x 29
$(OutDir)\echogs -a $(IntDir)\gconfigv.h -x 23 define EXTEND_NAMES 0$(EXTEND_NAMES)
$(OutDir)\echogs -w $(IntDir)\jconfig.h -+R $(SolutionDir)src\stdpn.h -+R $(SolutionDir)src\stdpre.h -+R $(SolutionDir)src\gsjconf.h
copy $(SolutionDir)src\gsjmorec.h $(IntDir)\jmorecfg.h
copy $(SolutionDir)jpeg\jmorecfg.h $(IntDir)\jmcorig.h
copy $(SolutionDir)jpeg\jpeglib.h $(IntDir)\jpeglib_.h
copy $(SolutionDir)src\gscdef.c $(IntDir)\gscdefs.c
"
echo /^>
echo ^<Tool Name="VCCLCompilerTool"
echo Optimization="0"
@@ -1141,9 +1141,7 @@
echo ^<UserMacro Name="GS_REVISION" Value="$(GS_VERSION)" /^>
echo ^<UserMacro Name="SEARCH_HERE_FIRST" Value="1" /^>
echo ^<UserMacro Name="FPU_TYPE" Value="387" /^>
-REM echo ^<UserMacro Name="USE_ASM" Value="0" /^>
REM echo ^<UserMacro Name="EXTEND_NAMES" Value="0" /^>
-echo ^<UserMacro Name="SYSTEM_CONSTANTS_ARE_WRITABLE" Value="0" /^>
echo ^</VisualStudioPropertySheet^>
goto end
More information about the gs-cvs
mailing list