You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Eric Dumas <du...@gandalf.freenix.org> on 1999/11/26 18:18:03 UTC
[Patch] apr_pools.c
Hello.
Please consider the following patch... to allow the correct build of
Apache.
Thanks.
[Solaris2.6/egcs1.1.2]
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.22
diff -u -r1.22 apr_pools.c
--- apr_pools.c 1999/11/24 22:30:06 1.22
+++ apr_pools.c 1999/11/26 17:15:55
@@ -207,7 +207,7 @@
return NULL; \
} \
else { \
- fprintf(stderr, "%s", str);
+ fprintf(stderr, "%s", str); \
func(retcode); \
} \
}
@@ -278,7 +278,7 @@
#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;
--
Eric Dumas (dumas@Linux.EU.Org, dumas@freenix.org)
http://www.freenix.org/~dumas/
-- Linux -- Linux -- Linux -- Linux -- Linux -- Linux -- Linux -- Linux --
Re: [Patch] apr_pools.c
Posted by Greg Stein <gs...@lyra.org>.
I've applied it. Thx.
-g
On Fri, 26 Nov 1999, Eric Dumas wrote:
> Hello.
>
> Please consider the following patch... to allow the correct build of
> Apache.
>
> Thanks.
>
> [Solaris2.6/egcs1.1.2]
>
> ===================================================================
> RCS file: /cvs/apache/apache-2.0/src/lib/apr/lib/apr_pools.c,v
> retrieving revision 1.22
> diff -u -r1.22 apr_pools.c
> --- apr_pools.c 1999/11/24 22:30:06 1.22
> +++ apr_pools.c 1999/11/26 17:15:55
> @@ -207,7 +207,7 @@
> return NULL; \
> } \
> else { \
> - fprintf(stderr, "%s", str);
> + fprintf(stderr, "%s", str); \
> func(retcode); \
> } \
> }
> @@ -278,7 +278,7 @@
> #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;
>
>
> --
> Eric Dumas (dumas@Linux.EU.Org, dumas@freenix.org)
> http://www.freenix.org/~dumas/
> -- Linux -- Linux -- Linux -- Linux -- Linux -- Linux -- Linux -- Linux --
>
--
Greg Stein, http://www.lyra.org/