Return const char* from apr_pool_tag

clang warns:

  warning: returning 'const char *' from a function with result type
    'char *' discards qualifiers [-Wincompatible-pointer-types]

diff --git a/libs/apr/include/apr_pools.h b/libs/apr/include/apr_pools.h
index 74ed59e35b31736f5b8e06b7cd0d3fc4f594888f..886323fa66b95ea3101a33b9b424d883bb310683 100644 (file)
--- a/libs/apr/include/apr_pools.h
+++ b/libs/apr/include/apr_pools.h
@@ -409,7 +409,7 @@ APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
  * @param pool The pool to tag
  * @param tag  The tag
  */
-APR_DECLARE(char *) apr_pool_tag(apr_pool_t *pool, const char *tag);
+APR_DECLARE(const char *) apr_pool_tag(apr_pool_t *pool, const char *tag);
 
 #if APR_HAS_THREADS
 /**

diff --git a/libs/apr/memory/unix/apr_pools.c b/libs/apr/memory/unix/apr_pools.c
index 99e1888b1fb3f718df314a5683189ba33ac2a6b8..7ddc5e2af833841ed558ad59c7fca3fe820e4e14 100644 (file)
--- a/libs/apr/memory/unix/apr_pools.c
+++ b/libs/apr/memory/unix/apr_pools.c
@@ -1895,7 +1895,7 @@ APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b)
     return 0;
 }
 
-APR_DECLARE(char *) apr_pool_tag(apr_pool_t *pool, const char *tag)
+APR_DECLARE(const char *) apr_pool_tag(apr_pool_t *pool, const char *tag)
 {
        if (tag) {
                pool->tag = tag;