summaryrefslogtreecommitdiff
path: root/dso
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2002-05-02 13:28:24 +0000
committerJim Jagielski <jim@apache.org>2002-05-02 13:28:24 +0000
commit9364b74c15c99af662854a89d479d30ababf77e6 (patch)
treed3afa2c21e566024793636c24d67fa81dc97f6de /dso
parentd18df9e344cd79007e6508d099d7a9a17bcbd8db (diff)
downloadapr-9364b74c15c99af662854a89d479d30ababf77e6.tar.gz
OK. This is admittedly anal. But the whole idea behind cpp macros
is to avoid things like "we know NSLINKMODULE_OPTION_NONE is 0" and making such shortcuts as this. This makes it clear what exactly we are setting, and though admittedly verbose, the tradeoff of a few bytes of source is worth it :) PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63347 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dso')
-rw-r--r--dso/unix/dso.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/dso/unix/dso.c b/dso/unix/dso.c
index bb3d0b685..a6d3860e2 100644
--- a/dso/unix/dso.c
+++ b/dso/unix/dso.c
@@ -126,9 +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) {
-#if defined(NSLINKMODULE_OPTION_RETURN_ON_ERROR)
+#if defined(NSLINKMODULE_OPTION_RETURN_ON_ERROR) && defined(NSLINKMODULE_OPTION_NONE)
os_handle = NSLinkModule(image, path,
- NSLINKMODULE_OPTION_RETURN_ON_ERROR);
+ NSLINKMODULE_OPTION_RETURN_ON_ERROR |
+ NSLINKMODULE_OPTION_NONE);
#else
os_handle = NSLinkModule(image, path, FALSE);
#endif