From 932dccd475937cb1e8bcd6a787893d8fefa4ddbc Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sun, 24 Jun 2012 08:11:23 +0000 Subject: [PATCH] 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] --- libs/apr/include/apr_pools.h | 2 +- libs/apr/memory/unix/apr_pools.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/apr/include/apr_pools.h b/libs/apr/include/apr_pools.h index 74ed59e35b..886323fa66 100644 --- 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 99e1888b1f..7ddc5e2af8 100644 --- 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;