[mapserver-commits] r10461 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-08-19 04:38:34 +0000 (Thu, 19 Aug 2010)
New Revision: 10461

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapserver.h
Log:
avoid cvs id warnings, fix by EvenR in GDAL

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-08-18 22:01:15 UTC (rev 10460)
+++ trunk/mapserver/HISTORY.TXT	2010-08-19 04:38:34 UTC (rev 10461)
@@ -13,6 +13,8 @@
 
 Current Version (SVN trunk):
 ----------------------------
+- Avoid warnings about ms_cvsid being unused with gcc. 
+
 - Ensure the class is not marked BeforeFieldInit causing memory corruption with C#/CLR4 (#3438)
 
 - Fixed MSSQL2008 driver returning invalid extent (#3498)

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2010-08-18 22:01:15 UTC (rev 10460)
+++ trunk/mapserver/mapserver.h	2010-08-19 04:38:34 UTC (rev 10461)
@@ -62,8 +62,12 @@
 #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(void) { return( cvsid_aw() ? ((char *) NULL) : ms_cvsid ); }
+static char *cvsid_aw() { return( cvsid_aw() ? ((char *) NULL) : ms_cvsid ); }
+#endif
 #else
 #  define MS_CVSID(string)
 #endif