Or'ing NSLINKMODULE_OPTION_NONE is verbose.

Darwin comment is true on all platforms.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63341 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 11 deletions

diff --git a/dso/unix/dso.c b/dso/unix/dso.c
index a9b22b28e..b92ae669d 100644
--- a/dso/unix/dso.c
+++ b/dso/unix/dso.c
@@ -126,18 +126,10 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
     NSModule os_handle = NULL;
     char* err_msg = NULL;
     if (NSCreateObjectFileImageFromFile(path, &image) == NSObjectFileImageSuccess) {
-
-/*
- * Under Darwin, we want/need to place dynamically loaded extensions'
- * public symbols into the global symbol table. As long as modules
- * don't have overlapping symbols, we're golden.
- */
-#if defined(NSLINKMODULE_OPTION_NONE)
-        os_handle = NSLinkModule(image, path,
-                                 NSLINKMODULE_OPTION_NONE |
-                                 NSLINKMODULE_OPTION_RETURN_ON_ERROR);
+#if defined(NSLINKMODULE_OPTION_RETURN_ON_ERROR)
+        handle = NSLinkModule(image, path, NSLINKMODULE_OPTION_RETURN_ON_ERROR);
 #else
-        os_handle = NSLinkModule(image, path, FALSE);
+        handle = NSLinkModule(image, path, FALSE);
 #endif
         NSDestroyObjectFileImage(image);
     }