merge r602460 from trunk:

z/OS: return standard apr_status_t codes from apr_dso_load()
and apr_dso_sym().

Submitted by: David Jones <oscaremma gmail.com>
Reviewed by:  trawick


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@602919 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 265975105..cbce472d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.2.13
 
+  *) z/OS: return standard apr_status_t codes from apr_dso_load()
+     and apr_dso_sym().  [David Jones <oscaremma gmail.com>]
+
   *) Fix the make test target in the spec file. [Graham Leggett]
 
 Changes for APR 1.2.12
diff --git a/dso/os390/dso.c b/dso/os390/dso.c
index 034ffe843..9344c71a1 100644
--- a/dso/os390/dso.c
+++ b/dso/os390/dso.c
@@ -72,7 +72,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
     }
 
     (*res_handle)->failing_errno = errno;
-    return errno;
+    return APR_EDSOOPEN;
 }
 
 APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
@@ -96,7 +96,7 @@ APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,
         return APR_SUCCESS;
     }
     handle->failing_errno = errno;
-    return errno;
+    return APR_ESYMNOTFOUND;
 }
 
 APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *handle, char *buffer,