From: Brian Havard <bjh@apache.org>
Date: Tue, 22 Jun 2010 12:23:13 +0000 (+0000)
Subject: OS/2 build fix:
X-Git-Tag: 2.3.7~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e137b779d7926a812ffc5b0a300c16a4a556347e;p=apache

OS/2 build fix:
Remove use of non-portable apr_get_os_error() and just return APR_ENOMEM if
apr_pcalloc() returns NULL.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956860 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c
index 136e438ac1..551d49aa0d 100644
--- a/modules/core/mod_watchdog.c
+++ b/modules/core/mod_watchdog.c
@@ -442,7 +442,7 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog,
     apr_pool_userdata_get((void *)&wd_server_conf, pk, pproc);
     if (!wd_server_conf) {
         if (!(wd_server_conf = apr_pcalloc(pproc, sizeof(wd_server_conf_t))))
-            return apr_get_os_error();
+            return APR_ENOMEM;
         apr_pool_create(&wd_server_conf->pool, pproc);
         wd_server_conf->s = s;
         apr_pool_userdata_set(wd_server_conf, pk, apr_pool_cleanup_null, pproc);