[mapserver-commits] r12252 - in trunk/mapserver/mapcache: . include src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:11:12 -0700 (Fri, 26 Aug 2011)
New Revision: 12252

Modified:
   trunk/mapserver/mapcache/geocache.xml
   trunk/mapserver/mapcache/include/util.h
   trunk/mapserver/mapcache/src/util.c
Log:
use / in front of semaphore name (thanks Chris J. Mutter)

dont use sem_getvalue as we dont need it. only the process/thread that
has created the semaphore needs to call sem_unlink on it.
thomas.bonfort | 2011-01-17 08:55:58 +0100 (Mon, 17 Jan 2011)

Modified: trunk/mapserver/mapcache/geocache.xml
===================================================================
--- trunk/mapserver/mapcache/geocache.xml	2011-08-26 11:11:08 UTC (rev 12251)
+++ trunk/mapserver/mapcache/geocache.xml	2011-08-26 11:11:12 UTC (rev 12252)
@@ -242,7 +242,7 @@
       <wmsparams>
          <FORMAT>image/png</FORMAT>
          <LAYERS>default</LAYERS>
-         <MAP>/Users/tbonfort/dev/mapserver-utils/osm-mapserver.map</MAP>
+         <MAP>/home/tbonfort/dev/mapserver-utils/osm-mapserver.map</MAP>
       </wmsparams>
    </source>
    <source name="nexrad" type="wms">

Modified: trunk/mapserver/mapcache/include/util.h
===================================================================
--- trunk/mapserver/mapcache/include/util.h	2011-08-26 11:11:08 UTC (rev 12251)
+++ trunk/mapserver/mapcache/include/util.h	2011-08-26 11:11:12 UTC (rev 12252)
@@ -39,19 +39,6 @@
 
 #endif
 
-#if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 4
-
-/**
- * Create a hard link to the specified file.
- * @param from_path The full path to the original file (using / on all systems)
- * @param to_path The full path to the new file (using / on all systems)
- * @remark Both files must reside on the same device.
- */
-APR_DECLARE(apr_status_t) apr_file_link(const char *from_path, const char *to_path);
-
-#endif
-
-
 #endif /* UTIL_H_ */
 /* vim: ai ts=3 sts=3 et sw=3
 */

Modified: trunk/mapserver/mapcache/src/util.c
===================================================================
--- trunk/mapserver/mapcache/src/util.c	2011-08-26 11:11:08 UTC (rev 12251)
+++ trunk/mapserver/mapcache/src/util.c	2011-08-26 11:11:12 UTC (rev 12252)
@@ -75,19 +75,6 @@
    return GEOCACHE_SUCCESS;
 }
 
-
-
-#if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 4
-APR_DECLARE(apr_status_t) apr_file_link(const char *from_path, 
-                                          const char *to_path)
-{
-    if (link(from_path, to_path) == -1) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-#endif
-
 #if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 3
 APR_DECLARE(apr_table_t *) apr_table_clone(apr_pool_t *p, const apr_table_t *t)
 {