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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:16:55 -0700 (Fri, 26 Aug 2011)
New Revision: 12323

Modified:
   trunk/mapserver/mapcache/include/util.h
   trunk/mapserver/mapcache/src/util.c
Log:
bump version info
thomas.bonfort | 2011-03-03 15:38:46 +0100 (Thu, 03 Mar 2011)

Modified: trunk/mapserver/mapcache/include/util.h
===================================================================
--- trunk/mapserver/mapcache/include/util.h	2011-08-26 11:16:50 UTC (rev 12322)
+++ trunk/mapserver/mapcache/include/util.h	2011-08-26 11:16:55 UTC (rev 12323)
@@ -31,7 +31,7 @@
 #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
 #endif
 
-#if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 3
+#if APR_MAJOR_VERSION < 1 || (APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 3)
 
 
 
@@ -49,6 +49,30 @@
 
 #endif
 
+#if APR_MAJOR_VERSION < 1
+   #ifndef APR_FOPEN_READ
+      #define APR_FOPEN_READ APR_READ
+   #endif
+   #ifndef APR_FOPEN_BUFFERED
+      #define APR_FOPEN_BUFFERED APR_BUFFERED
+   #endif
+
+   #ifndef APR_FOPEN_BINARY
+      #define APR_FOPEN_BINARY APR_BINARY
+   #endif
+   
+   #ifndef APR_FOPEN_CREATE
+      #define APR_FOPEN_CREATE APR_CREATE
+   #endif
+
+
+   #ifndef APR_FOPEN_WRITE
+      #define APR_FOPEN_WRITE APR_WRITE
+   #endif
+#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:16:50 UTC (rev 12322)
+++ trunk/mapserver/mapcache/src/util.c	2011-08-26 11:16:55 UTC (rev 12323)
@@ -75,7 +75,7 @@
    return GEOCACHE_SUCCESS;
 }
 
-#if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 3
+#if APR_MAJOR_VERSION < 1 || (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)
 {
     const apr_array_header_t *array = apr_table_elts(t);