[mapserver-commits] r12305 - trunk/mapserver/mapcache/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:15:24 -0700 (Fri, 26 Aug 2011)
New Revision: 12305

Modified:
   trunk/mapserver/mapcache/src/lock.c
Log:
fix bug with tile merging
thomas.bonfort | 2011-02-10 12:02:23 +0100 (Thu, 10 Feb 2011)

Modified: trunk/mapserver/mapcache/src/lock.c
===================================================================
--- trunk/mapserver/mapcache/src/lock.c	2011-08-26 11:15:20 UTC (rev 12304)
+++ trunk/mapserver/mapcache/src/lock.c	2011-08-26 11:15:24 UTC (rev 12305)
@@ -69,12 +69,19 @@
          lockname = apr_pstrcat(ctx->pool,lockname,dimvalue,NULL);
       }
 
-   }      
+   }
+
+#ifdef __APPLE__
+#ifndef SEM_NAME_LEN
+#define SEM_NAME_LEN 31
+#endif
+#endif
+
 #ifdef SEM_NAME_LEN
    /* truncate the lockname to the number of allowed characters */
-#warning "current platform only supports short semaphore names. lock name max length: " SEM_NAME_LEN
+#warning "current platform only supports short semaphore names. you may see failed requests"
    if(strlen(lockname) >= SEM_NAME_LEN) {
-      lockname[SEM_NAME_LEN]='\0';
+      lockname[SEM_NAME_LEN-1]='\0';
    }
 #endif
    return lockname;