From 44b38367f2b33521e495bc23966f3831d1fbda08 Mon Sep 17 00:00:00 2001 From: Thomas Bonfort Date: Tue, 22 May 2012 06:28:08 +0200 Subject: [PATCH] remove MSCVSID usage --- cgiutil.c | 2 +- classobject.c | 2 +- layerobject.c | 2 +- legend.c | 2 +- mapbits.c | 2 +- mapchart.c | 2 +- mapcluster.c | 2 +- mapcontext.c | 2 +- mapcopy.c | 2 +- mapcpl.c | 2 +- mapcrypto.c | 2 +- mapdebug.c | 2 +- mapdraw.c | 2 +- mapdrawgdal.c | 2 +- maperror.c | 2 +- mapfile.c | 2 +- mapgdal.c | 2 +- mapgml.c | 2 +- mapgraticule.c | 2 +- maphash.c | 2 +- maphttp.c | 2 +- mapimageio.c | 2 +- mapimagemap.c | 2 +- mapio.c | 2 +- mapjoin.c | 2 +- maplabel.c | 2 +- maplayer.c | 2 +- maplegend.c | 2 +- maplibxml2.c | 2 +- mapmssql2008.c | 2 +- mapobject.c | 2 +- mapogcfilter.c | 2 +- mapogcfiltercommon.c | 2 +- mapogcsld.c | 2 +- mapogcsos.c | 2 +- mapogl.cpp | 2 +- mapoglcontext.cpp | 2 +- mapoglrenderer.cpp | 2 +- mapogr.cpp | 2 +- mapogroutput.c | 2 +- maporaclespatial.c | 2 +- mapoutput.c | 2 +- mapows.c | 2 +- mapowscommon.c | 2 +- mappluginlayer.c | 2 +- mappool.c | 2 +- mappostgis.c | 2 +- mappostgresql.c | 2 +- mapprimitive.c | 2 +- mapproject.c | 2 +- mapquery.c | 2 +- mapraster.c | 2 +- maprasterquery.c | 2 +- mapresample.c | 2 +- mapscale.c | 2 +- mapsearch.c | 2 +- mapserv.c | 2 +- mapserver.h | 11 ----------- mapshape.c | 2 +- mapstring.c | 2 +- mapsymbol.c | 2 +- maptclutf.c | 2 +- maptemplate.c | 2 +- mapthread.c | 2 +- maptime.c | 2 +- maptree.c | 2 +- mapunion.c | 2 +- maputil.c | 2 +- mapwcs.c | 2 +- mapwcs11.c | 2 +- mapwcs20.c | 2 +- mapwfs.c | 2 +- mapwfs11.c | 2 +- mapwfslayer.c | 2 +- mapwms.c | 2 +- mapxbase.c | 2 +- msencrypt.c | 2 +- scalebar.c | 2 +- shp2img.c | 2 +- shptree.c | 2 +- shptreetst.c | 2 +- shptreevis.c | 2 +- sortshp.c | 2 +- sym2img.c | 2 +- testcopy.c | 2 +- testexpr.c | 2 +- tile4ms.c | 2 +- 87 files changed, 86 insertions(+), 97 deletions(-) diff --git a/cgiutil.c b/cgiutil.c index 5d81ed283e..f617dd563f 100644 --- a/cgiutil.c +++ b/cgiutil.c @@ -36,7 +36,7 @@ #include "mapserver.h" #include "cgiutil.h" -MS_CVSID("$Id$") + #define LF 10 #define CR 13 diff --git a/classobject.c b/classobject.c index 210ee28cc3..180cfce4c6 100644 --- a/classobject.c +++ b/classobject.c @@ -36,7 +36,7 @@ # include "cpl_conv.h" #endif -MS_CVSID("$Id$") + /* ** Add a label to a classObj (order doesn't matter for labels like it does with styles) diff --git a/layerobject.c b/layerobject.c index c2cc75dda7..931e0e1a59 100644 --- a/layerobject.c +++ b/layerobject.c @@ -36,7 +36,7 @@ # include "cpl_conv.h" #endif -MS_CVSID("$Id$") + /* =========================================================================== msInsertClass diff --git a/legend.c b/legend.c index 1377af5f75..f316233a74 100644 --- a/legend.c +++ b/legend.c @@ -29,7 +29,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + int main(int argc, char *argv[]) { diff --git a/mapbits.c b/mapbits.c index 5501ac4c3c..1987220c76 100644 --- a/mapbits.c +++ b/mapbits.c @@ -32,7 +32,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + #include diff --git a/mapchart.c b/mapchart.c index 20739b0ac4..af2b2d2718 100644 --- a/mapchart.c +++ b/mapchart.c @@ -30,7 +30,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + #define MS_CHART_TYPE_PIE 1 #define MS_CHART_TYPE_BAR 2 diff --git a/mapcluster.c b/mapcluster.c index 80255b0879..4fc0bdcaae 100644 --- a/mapcluster.c +++ b/mapcluster.c @@ -33,7 +33,7 @@ #include #include "mapserver.h" -MS_CVSID("$Id$") + #ifdef USE_CLUSTER_PLUGIN diff --git a/mapcontext.c b/mapcontext.c index 70f8482a7e..f5141e2d80 100644 --- a/mapcontext.c +++ b/mapcontext.c @@ -28,7 +28,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + #if defined(USE_WMS_LYR) && defined(USE_OGR) diff --git a/mapcopy.c b/mapcopy.c index ee92aba241..440232a533 100644 --- a/mapcopy.c +++ b/mapcopy.c @@ -45,7 +45,7 @@ #include "mapserver.h" #include "mapsymbol.h" -MS_CVSID("$Id$") + #include "mapcopy.h" diff --git a/mapcpl.c b/mapcpl.c index c33846bdd7..b6f343358a 100644 --- a/mapcpl.c +++ b/mapcpl.c @@ -41,7 +41,7 @@ #include #include "mapserver.h" -MS_CVSID("$Id$") + /* should be size of largest possible filename */ #define MS_PATH_BUF_SIZE 2048 diff --git a/mapcrypto.c b/mapcrypto.c index 37f0ae31f0..a90175f304 100644 --- a/mapcrypto.c +++ b/mapcrypto.c @@ -34,7 +34,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + /********************************************************************** diff --git a/mapdebug.c b/mapdebug.c index b085395f75..4b9b1d8a9b 100644 --- a/mapdebug.c +++ b/mapdebug.c @@ -48,7 +48,7 @@ #include /* OutputDebugStringA() */ #endif -MS_CVSID("$Id$") + #ifndef USE_THREAD diff --git a/mapdraw.c b/mapdraw.c index 6b1c6c6e5e..a4c3d78b8b 100644 --- a/mapdraw.c +++ b/mapdraw.c @@ -33,7 +33,7 @@ #include "maptime.h" #include "mapcopy.h" -MS_CVSID("$Id$") + #ifdef USE_GD /* diff --git a/mapdrawgdal.c b/mapdrawgdal.c index 04e8ec1828..da20ba0161 100644 --- a/mapdrawgdal.c +++ b/mapdrawgdal.c @@ -33,7 +33,7 @@ #include "mapresample.h" #include "mapthread.h" -MS_CVSID("$Id$") + extern int InvGeoTransform( double *gt_in, double *gt_out ); diff --git a/maperror.c b/maperror.c index 7e48f4f84e..eb77f7bac2 100644 --- a/maperror.c +++ b/maperror.c @@ -39,7 +39,7 @@ #endif #include -MS_CVSID("$Id$") + static char *ms_errorCodes[MS_NUMERRORCODES] = {"", "Unable to access file.", diff --git a/mapfile.c b/mapfile.c index e2d758a19a..401c1a4539 100644 --- a/mapfile.c +++ b/mapfile.c @@ -43,7 +43,7 @@ # include "gdal.h" #endif -MS_CVSID("$Id$") + extern int msyylex(void); extern void msyyrestart(FILE *); diff --git a/mapgdal.c b/mapgdal.c index 64e02a36f8..d9dde4a9f5 100644 --- a/mapgdal.c +++ b/mapgdal.c @@ -31,7 +31,7 @@ #include "mapserver.h" #include "mapthread.h" -MS_CVSID("$Id$") + #if defined(USE_GDAL) || defined(USE_OGR) #include "cpl_conv.h" diff --git a/mapgml.c b/mapgml.c index 3cd64ed15c..ad5539aa4e 100644 --- a/mapgml.c +++ b/mapgml.c @@ -31,7 +31,7 @@ #include "maperror.h" #include "mapgml.h" -MS_CVSID("$Id$") + /* Use only mapgml.c if WMS or WFS is available (with minor exceptions at end)*/ diff --git a/mapgraticule.c b/mapgraticule.c index 442f3aac6f..2b5f30f58d 100644 --- a/mapgraticule.c +++ b/mapgraticule.c @@ -30,7 +30,7 @@ #include #include "mapproject.h" -MS_CVSID("$Id$") + /********************************************************************************************************************** * diff --git a/maphash.c b/maphash.c index 26ccf8f151..b35edb0dd8 100644 --- a/maphash.c +++ b/maphash.c @@ -32,7 +32,7 @@ #include "mapserver.h" #include "maphash.h" -MS_CVSID("$Id$") + static unsigned hash(const char *key) { diff --git a/maphttp.c b/maphttp.c index 9a383fc3a5..c86b2bd284 100644 --- a/maphttp.c +++ b/maphttp.c @@ -37,7 +37,7 @@ #include "maperror.h" #include "mapthread.h" -MS_CVSID("$Id$") + #include #ifndef _WIN32 diff --git a/mapimageio.c b/mapimageio.c index 008e82baaf..1dc906378c 100644 --- a/mapimageio.c +++ b/mapimageio.c @@ -38,7 +38,7 @@ #include "gif_lib.h" #endif -MS_CVSID("$Id$") + typedef struct _streamInfo { FILE *fp; diff --git a/mapimagemap.c b/mapimagemap.c index ae7cfa0463..fbf7cf03cd 100644 --- a/mapimagemap.c +++ b/mapimagemap.c @@ -38,7 +38,7 @@ #include #endif -MS_CVSID("$Id$") + #define MYDEBUG 0 #define DEBUG_IF if (MYDEBUG > 2) diff --git a/mapio.c b/mapio.c index 8a31adeef4..65e2166143 100644 --- a/mapio.c +++ b/mapio.c @@ -43,7 +43,7 @@ #endif -MS_CVSID("$Id$") + static int is_msIO_initialized = MS_FALSE; diff --git a/mapjoin.c b/mapjoin.c index 828530c0cd..8ad2db2f5a 100644 --- a/mapjoin.c +++ b/mapjoin.c @@ -29,7 +29,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + #define ROW_ALLOCATION_SIZE 10 diff --git a/maplabel.c b/maplabel.c index 394912a6d3..8445b7339b 100644 --- a/maplabel.c +++ b/maplabel.c @@ -33,7 +33,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + /** diff --git a/maplayer.c b/maplayer.c index fa14efa376..d630f7f6c1 100644 --- a/maplayer.c +++ b/maplayer.c @@ -36,7 +36,7 @@ #include "mapparser.h" #include -MS_CVSID("$Id$") + static int populateVirtualTable(layerVTableObj *vtable); diff --git a/maplegend.c b/maplegend.c index 3263b20c8d..540afdc00d 100644 --- a/maplegend.c +++ b/maplegend.c @@ -29,7 +29,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + #define PSF .8 #define VMARGIN 5 /* margin at top and bottom of legend graphic */ diff --git a/maplibxml2.c b/maplibxml2.c index 52dfba90a3..8ea501607b 100644 --- a/maplibxml2.c +++ b/maplibxml2.c @@ -36,7 +36,7 @@ #include #include -MS_CVSID("$Id$") + /** * msLibXml2GenerateList() diff --git a/mapmssql2008.c b/mapmssql2008.c index 77e21fac3b..ca1958c805 100644 --- a/mapmssql2008.c +++ b/mapmssql2008.c @@ -49,7 +49,7 @@ #include #include /* tolower() */ -MS_CVSID("$Id$") + /* Native geometry parser macros */ diff --git a/mapobject.c b/mapobject.c index f7618f9f2b..fd2ae93e70 100644 --- a/mapobject.c +++ b/mapobject.c @@ -35,7 +35,7 @@ # include "cpl_conv.h" #endif -MS_CVSID("$Id$") + void freeWeb(webObj *web); void freeScalebar(scalebarObj *scalebar); diff --git a/mapogcfilter.c b/mapogcfilter.c index fc72f5f0cc..2f8e5faa2a 100644 --- a/mapogcfilter.c +++ b/mapogcfilter.c @@ -38,7 +38,7 @@ #include "mapserver.h" #include "mapowscommon.h" -MS_CVSID("$Id$") + int FLTIsNumeric(char *pszValue) diff --git a/mapogcfiltercommon.c b/mapogcfiltercommon.c index 85d471556b..552a103b1e 100644 --- a/mapogcfiltercommon.c +++ b/mapogcfiltercommon.c @@ -34,7 +34,7 @@ #include "mapserver.h" #include "mapowscommon.h" -MS_CVSID("$Id$") + #ifdef USE_OGR diff --git a/mapogcsld.c b/mapogcsld.c index eceb211847..240304b193 100644 --- a/mapogcsld.c +++ b/mapogcsld.c @@ -34,7 +34,7 @@ #include "cpl_string.h" #endif -MS_CVSID("$Id$") + #define SLD_LINE_SYMBOL_NAME "sld_line_symbol" #define SLD_LINE_SYMBOL_DASH_NAME "sld_line_symbol_dash" diff --git a/mapogcsos.c b/mapogcsos.c index ad7e032605..7251b1b9db 100644 --- a/mapogcsos.c +++ b/mapogcsos.c @@ -32,7 +32,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + #if defined(USE_SOS_SVR) && defined(USE_LIBXML2) diff --git a/mapogl.cpp b/mapogl.cpp index aecd8e02bb..881b9f9c52 100644 --- a/mapogl.cpp +++ b/mapogl.cpp @@ -35,7 +35,7 @@ #include "mapoglrenderer.h" #include "mapoglcontext.h" -MS_CVSID("$Id$") + imageObj* createImageObjOgl(OglRenderer* renderer) { diff --git a/mapoglcontext.cpp b/mapoglcontext.cpp index ec555bd368..172e1e9792 100644 --- a/mapoglcontext.cpp +++ b/mapoglcontext.cpp @@ -33,7 +33,7 @@ #include "maperror.h" #include "mapoglcontext.h" -MS_CVSID("$Id$") + #define _T(x) __TEXT(x) diff --git a/mapoglrenderer.cpp b/mapoglrenderer.cpp index 7b5d094148..10b050ef1d 100644 --- a/mapoglrenderer.cpp +++ b/mapoglrenderer.cpp @@ -36,7 +36,7 @@ #include "maperror.h" #include "mapoglrenderer.h" -MS_CVSID("$Id$") + using namespace std; diff --git a/mapogr.cpp b/mapogr.cpp index 5c357d7d7d..156a7e5c9a 100644 --- a/mapogr.cpp +++ b/mapogr.cpp @@ -40,7 +40,7 @@ # include "ogr_srs_api.h" #endif -MS_CVSID("$Id$") + #define ACQUIRE_OGR_LOCK msAcquireLock( TLOCK_OGR ) #define RELEASE_OGR_LOCK msReleaseLock( TLOCK_OGR ) diff --git a/mapogroutput.c b/mapogroutput.c index ce453da204..6dcd72b9b6 100644 --- a/mapogroutput.c +++ b/mapogroutput.c @@ -41,7 +41,7 @@ # include "cpl_string.h" #endif -MS_CVSID("$Id$") + #ifdef USE_OGR diff --git a/maporaclespatial.c b/maporaclespatial.c index 40c712f83a..9d5d27d725 100644 --- a/maporaclespatial.c +++ b/maporaclespatial.c @@ -39,7 +39,7 @@ #include "mapserver.h" #include -MS_CVSID("$Id$") + #ifdef USE_ORACLESPATIAL diff --git a/mapoutput.c b/mapoutput.c index 600074c4d9..bd61a09c8a 100644 --- a/mapoutput.c +++ b/mapoutput.c @@ -30,7 +30,7 @@ #include #include "mapserver.h" -MS_CVSID("$Id$") + static outputFormatObj *msAllocOutputFormat( mapObj *map, const char *name, const char *driver ); diff --git a/mapows.c b/mapows.c index ba2168089e..3afbbaf759 100644 --- a/mapows.c +++ b/mapows.c @@ -42,7 +42,7 @@ #include #include -MS_CVSID("$Id$") + /* ** msOWSInitRequestObj() initializes an owsRequestObj; i.e: sets diff --git a/mapowscommon.c b/mapowscommon.c index a46f174e0d..b2779ce87d 100644 --- a/mapowscommon.c +++ b/mapowscommon.c @@ -42,7 +42,7 @@ #include "mapowscommon.h" #include "maplibxml2.h" -MS_CVSID("$Id$") + diff --git a/mappluginlayer.c b/mappluginlayer.c index 5f8121beb6..ee51679ceb 100644 --- a/mappluginlayer.c +++ b/mappluginlayer.c @@ -30,7 +30,7 @@ #include "mapserver.h" #include "mapthread.h" -MS_CVSID("$Id$") + typedef struct { char *name; diff --git a/mappool.c b/mappool.c index aca0686cff..b8ebb231cb 100644 --- a/mappool.c +++ b/mappool.c @@ -134,7 +134,7 @@ o The connection pooling API will let a connection be used/referenced multiple #include "mapserver.h" #include "mapthread.h" -MS_CVSID("$Id$") + /* defines for lifetime. A positive number is a time-from-last use in seconds */ diff --git a/mappostgis.c b/mappostgis.c index 827be92d7a..3078a410e3 100644 --- a/mappostgis.c +++ b/mappostgis.c @@ -80,7 +80,7 @@ #ifdef USE_POSTGIS -MS_CVSID("$Id$") + /* ** msPostGISCloseConnection() diff --git a/mappostgresql.c b/mappostgresql.c index a240e19cc9..0c04caed08 100644 --- a/mappostgresql.c +++ b/mappostgresql.c @@ -50,7 +50,7 @@ #include #include /* tolower() */ -MS_CVSID("$Id$") + typedef struct { diff --git a/mapprimitive.c b/mapprimitive.c index 437ff4b3ad..ca9f357584 100644 --- a/mapprimitive.c +++ b/mapprimitive.c @@ -32,7 +32,7 @@ #include #include -MS_CVSID("$Id$") + typedef enum {CLIP_LEFT, CLIP_MIDDLE, CLIP_RIGHT} CLIP_STATE; diff --git a/mapproject.c b/mapproject.c index 0e53c90b85..a817dcf970 100644 --- a/mapproject.c +++ b/mapproject.c @@ -35,7 +35,7 @@ #include #include "mapaxisorder.h" -MS_CVSID("$Id$") + #ifdef USE_PROJ static int msTestNeedWrap( pointObj pt1, pointObj pt2, pointObj pt2_geo, diff --git a/mapquery.c b/mapquery.c index 3e2ddce0dc..c527572d5b 100644 --- a/mapquery.c +++ b/mapquery.c @@ -29,7 +29,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + int msInitQuery(queryObj *query) { diff --git a/mapraster.c b/mapraster.c index 44d5551f58..45413748d5 100644 --- a/mapraster.c +++ b/mapraster.c @@ -35,7 +35,7 @@ #include "mapresample.h" #include "mapthread.h" -MS_CVSID("$Id$") + extern int msyylex_destroy(void); extern int yyparse(parseObj *); diff --git a/maprasterquery.c b/maprasterquery.c index d1e96a6e6a..f2d1edc185 100644 --- a/maprasterquery.c +++ b/maprasterquery.c @@ -32,7 +32,7 @@ #include "mapresample.h" #include "mapthread.h" -MS_CVSID("$Id$") + int msRASTERLayerGetShape(layerObj *layer, shapeObj *shape, resultObj *record); int msRASTERLayerGetItems(layerObj *layer); diff --git a/mapresample.c b/mapresample.c index ea339cd35a..91dead2cbd 100644 --- a/mapresample.c +++ b/mapresample.c @@ -31,7 +31,7 @@ #include "mapresample.h" #include "mapthread.h" -MS_CVSID("$Id$") + #ifndef MAX # define MIN(a,b) ((a #endif -MS_CVSID("$Id$") + /************************************************************************/ /* FastCGI cleanup functions. */ diff --git a/mapserver.h b/mapserver.h index 2de756d904..8c374348ff 100644 --- a/mapserver.h +++ b/mapserver.h @@ -65,17 +65,6 @@ #include #endif -#ifndef DISABLE_CVSID -#if defined(__GNUC__) && __GNUC__ >= 4 -# define MS_CVSID(string) static char ms_cvsid[] __attribute__((used)) = string; -#else -# define MS_CVSID(string) static char ms_cvsid[] = string; \ -static char *cvsid_aw() { return( cvsid_aw() ? ((char *) NULL) : ms_cvsid ); } -#endif -#else -# define MS_CVSID(string) -#endif - #if defined(_WIN32) && !defined(__CYGWIN__) # define MS_DLL_EXPORT __declspec(dllexport) #define USE_MSFREE diff --git a/mapshape.c b/mapshape.c index 56ba5fc201..6924a36f96 100644 --- a/mapshape.c +++ b/mapshape.c @@ -38,7 +38,7 @@ #include #include "mapserver.h" -MS_CVSID("$Id$") + /* Only use this macro on 32-bit integers! */ #define SWAP_FOUR_BYTES(data) \ diff --git a/mapstring.c b/mapstring.c index dea5cca396..5157a4dac9 100644 --- a/mapstring.c +++ b/mapstring.c @@ -33,7 +33,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + #include #include diff --git a/mapsymbol.c b/mapsymbol.c index 46de56c52c..ac40130a38 100644 --- a/mapsymbol.c +++ b/mapsymbol.c @@ -35,7 +35,7 @@ #include "mapcopy.h" #include "mapthread.h" -MS_CVSID("$Id$") + extern int msyylex(void); /* lexer globals */ extern void msyyrestart(FILE *); diff --git a/maptclutf.c b/maptclutf.c index 09c2498fcd..aa37fc76d6 100644 --- a/maptclutf.c +++ b/maptclutf.c @@ -89,7 +89,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + /* The source code of Tcl_UtfToUniChar() was borrowed from tclUtf.c diff --git a/maptemplate.c b/maptemplate.c index a591e83700..f839283b6d 100644 --- a/maptemplate.c +++ b/maptemplate.c @@ -37,7 +37,7 @@ #include -MS_CVSID("$Id$") + static char *olUrl = "http://www.mapserver.org/lib/OpenLayers-ms60.js"; static char *olTemplate = \ diff --git a/mapthread.c b/mapthread.c index ee9137c7f8..f13ca7828c 100644 --- a/mapthread.c +++ b/mapthread.c @@ -137,7 +137,7 @@ files instead. #include "mapserver.h" #include "mapthread.h" -MS_CVSID("$Id$") + #if defined(USE_THREAD) static int thread_debug = 0; diff --git a/maptime.c b/maptime.c index 2e8b63dc7a..00f92f4129 100644 --- a/maptime.c +++ b/maptime.c @@ -36,7 +36,7 @@ #include "maptime.h" #include "maperror.h" -MS_CVSID("$Id$") + typedef struct { char pattern[64]; diff --git a/maptree.c b/maptree.c index bcfa9e456f..9f3049044e 100644 --- a/maptree.c +++ b/maptree.c @@ -31,7 +31,7 @@ #include "mapserver.h" #include "maptree.h" -MS_CVSID("$Id$") + /* -------------------------------------------------------------------- */ /* If the following is 0.5, nodes will be split in half. If it */ diff --git a/mapunion.c b/mapunion.c index c5b256103a..3826f02d70 100644 --- a/mapunion.c +++ b/mapunion.c @@ -33,7 +33,7 @@ #include #include "mapserver.h" -MS_CVSID("$Id$") + #define MSUNION_NUMITEMS 3 #define MSUNION_SOURCELAYERNAME "Union:SourceLayerName" diff --git a/maputil.c b/maputil.c index 73722f927a..3d2082ad2a 100644 --- a/maputil.c +++ b/maputil.c @@ -46,7 +46,7 @@ #include #endif -MS_CVSID("$Id$") + extern char *msyystring_buffer; extern int msyylex_destroy(void); diff --git a/mapwcs.c b/mapwcs.c index 0b2c7f92c0..a0c1b7adbe 100644 --- a/mapwcs.c +++ b/mapwcs.c @@ -32,7 +32,7 @@ #include "mapthread.h" #include -MS_CVSID("$Id$") + #if defined(USE_WCS_SVR) diff --git a/mapwcs11.c b/mapwcs11.c index 16e6f4a919..a763063c2d 100644 --- a/mapwcs11.c +++ b/mapwcs11.c @@ -35,7 +35,7 @@ #include "mapthread.h" #include "mapwcs.h" -MS_CVSID("$Id$") + #if defined(USE_WCS_SVR) && defined(USE_LIBXML2) diff --git a/mapwcs20.c b/mapwcs20.c index f3f77ce72e..6260f08b16 100644 --- a/mapwcs20.c +++ b/mapwcs20.c @@ -53,7 +53,7 @@ #endif /* defined(USE_LIBXML2) */ -MS_CVSID("$Id$") + /************************************************************************/ /* msStringParseInteger() */ diff --git a/mapwfs.c b/mapwfs.c index 2ce14777e1..754af36257 100644 --- a/mapwfs.c +++ b/mapwfs.c @@ -28,7 +28,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + #if defined(USE_WFS_SVR) diff --git a/mapwfs11.c b/mapwfs11.c index cb4556927d..dbcb42dd8a 100644 --- a/mapwfs11.c +++ b/mapwfs11.c @@ -30,7 +30,7 @@ #include "mapserver.h" #include "mapows.h" -MS_CVSID("$Id$") + #if defined(USE_WFS_SVR) && defined(USE_LIBXML2) #include "maplibxml2.h" diff --git a/mapwfslayer.c b/mapwfslayer.c index 013c7d8960..917cc9ab66 100644 --- a/mapwfslayer.c +++ b/mapwfslayer.c @@ -37,7 +37,7 @@ #include #endif -MS_CVSID("$Id$") + #define WFS_V_0_0_14 14 #define WFS_V_1_0_0 100 diff --git a/mapwms.c b/mapwms.c index b05caa9830..420c6ba5af 100644 --- a/mapwms.c +++ b/mapwms.c @@ -49,7 +49,7 @@ #include #endif -MS_CVSID("$Id$") + /* ================================================================== * WMS Server stuff. diff --git a/mapxbase.c b/mapxbase.c index 2b01b3c177..6e338ebc70 100644 --- a/mapxbase.c +++ b/mapxbase.c @@ -34,7 +34,7 @@ #include /* for atof() and atoi() */ #include -MS_CVSID("$Id$") + /* try to use a large file version of fseek for files up to 4GB (#3514) */ #if _MSC_VER > 1310 diff --git a/msencrypt.c b/msencrypt.c index c77efda95b..994d9caf3d 100644 --- a/msencrypt.c +++ b/msencrypt.c @@ -29,7 +29,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + void PrintUsage() { diff --git a/scalebar.c b/scalebar.c index 29dbc4690f..fff97cd8ff 100644 --- a/scalebar.c +++ b/scalebar.c @@ -29,7 +29,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + int main(int argc, char *argv[]) { diff --git a/shp2img.c b/shp2img.c index 066eccb6b0..9b682db506 100644 --- a/shp2img.c +++ b/shp2img.c @@ -30,7 +30,7 @@ #include "mapserver.h" #include "maptime.h" -MS_CVSID("$Id$") + int main(int argc, char *argv[]) { diff --git a/shptree.c b/shptree.c index a9bb4d3670..8dc250b0ef 100644 --- a/shptree.c +++ b/shptree.c @@ -31,7 +31,7 @@ #include "maptree.h" #include -MS_CVSID("$Id$") + char* AddFileSuffix ( const char * Filename, const char * Suffix ) { char *pszFullname, *pszBasename; diff --git a/shptreetst.c b/shptreetst.c index 4a8e7d4e90..7801a727a4 100644 --- a/shptreetst.c +++ b/shptreetst.c @@ -34,7 +34,7 @@ #endif #include -MS_CVSID("$Id$") + #ifdef SHPT_POLYGON #undef MAPSERVER diff --git a/shptreevis.c b/shptreevis.c index b2277d6349..99f008fc77 100644 --- a/shptreevis.c +++ b/shptreevis.c @@ -35,7 +35,7 @@ #endif #include -MS_CVSID("$Id$") + #ifdef SHPT_POLYGON #undef MAPSERVER diff --git a/sortshp.c b/sortshp.c index e6e6fe03a9..c6fc1ac631 100644 --- a/sortshp.c +++ b/sortshp.c @@ -36,7 +36,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + typedef struct { double number; diff --git a/sym2img.c b/sym2img.c index 49985ca8b3..79731980cc 100644 --- a/sym2img.c +++ b/sym2img.c @@ -32,7 +32,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + #define MAXCOLORS 256 #define CELLSIZE 100 diff --git a/testcopy.c b/testcopy.c index c22bcf49f1..a3de7b9351 100644 --- a/testcopy.c +++ b/testcopy.c @@ -29,7 +29,7 @@ #include "mapserver.h" -MS_CVSID("$Id$") + void printAtts(mapObj*, const char*); diff --git a/testexpr.c b/testexpr.c index 2d1d32b721..3b115e4d14 100644 --- a/testexpr.c +++ b/testexpr.c @@ -33,7 +33,7 @@ #include "mapparser.h" #include "mapfile.h" -MS_CVSID("$Id$") + extern int msyyparse(); extern int msyylex(); diff --git a/tile4ms.c b/tile4ms.c index df78577764..df7fc8f48e 100644 --- a/tile4ms.c +++ b/tile4ms.c @@ -43,7 +43,7 @@ #include "mapserver.h" #include -MS_CVSID("$Id$") + /***********************************************************************/ int process_shapefiles(char *metaFileNameP, char *tileFileNameP,