summaryrefslogtreecommitdiff
path: root/lib/apr_pools.c
diff options
context:
space:
mode:
authorgstein <gstein@13f79535-47bb-0310-9956-ffa450edef68>1999-11-27 01:08:14 +0000
committergstein <gstein@13f79535-47bb-0310-9956-ffa450edef68>1999-11-27 01:08:14 +0000
commitbc92df65586218a6c160103c26043f6801b0d76a (patch)
treef0240a8a2201f8c436aa2ba58e8225d4089d685b /lib/apr_pools.c
parent8c60ae4c5c4c497030e15a36557d67b6c415e0ab (diff)
downloadlibapr-bc92df65586218a6c160103c26043f6801b0d76a.tar.gz
correct some build errors.
PR: Obtained from: Submitted by: Eric Dumas <dumas@gandalf.freenix.org> Reviewed by: gstein git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59489 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'lib/apr_pools.c')
-rw-r--r--lib/apr_pools.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/apr_pools.c b/lib/apr_pools.c
index 82196a514..aa566226a 100644
--- a/lib/apr_pools.c
+++ b/lib/apr_pools.c
@@ -203,12 +203,12 @@ union block_hdr {
#define APR_ABORT(conditional, retcode, func, str) \
if (conditional) { \
- if (func == NULL) { \
+ if ((func) == NULL) { \
return NULL; \
} \
else { \
- fprintf(stderr, "%s", str);
- func(retcode); \
+ fprintf(stderr, "%s", str); \
+ (*(func))(retcode); \
} \
}
@@ -278,7 +278,7 @@ static union block_hdr *malloc_block(int size, int (*apr_abort)(int retcode))
#endif /* ALLOC_STATS */
blok = (union block_hdr *) malloc(size + sizeof(union block_hdr));
- APR_ABORT(blok == NULL, APR_ENOMEM, (*apr_abort)
+ APR_ABORT(blok == NULL, APR_ENOMEM, apr_abort,
"Ouch! malloc failed in malloc_block()\n");
debug_fill(blok, size + sizeof(union block_hdr));
blok->h.next = NULL;