From: Jim Jagielski <jim@apache.org>
Date: Thu, 2 May 2002 13:28:46 +0000 (+0000)
Subject: OK. This is admittedly anal. But the whole idea behind cpp macros
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff37c01a93c1abb303352a4dba5741b5ca4aa6b2;p=thirdparty%2Fapache%2Fhttpd.git

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/httpd/httpd/branches/1.3.x@94901 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/os/unix/os.c b/src/os/unix/os.c
index 3142d982f74..3ee29642c49 100644
--- a/src/os/unix/os.c
+++ b/src/os/unix/os.c
@@ -111,8 +111,10 @@ void *ap_os_dso_load(const char *path)
     if (NSCreateObjectFileImageFromFile(path, &image) !=
         NSObjectFileImageSuccess)
         return NULL;
-#if defined(NSLINKMODULE_OPTION_RETURN_ON_ERROR)
-    handle = NSLinkModule(image, path, NSLINKMODULE_OPTION_RETURN_ON_ERROR);
+#if defined(NSLINKMODULE_OPTION_RETURN_ON_ERROR) && defined(NSLINKMODULE_OPTION_NONE)
+    handle = NSLinkModule(image, path,
+                          NSLINKMODULE_OPTION_RETURN_ON_ERROR |
+                          NSLINKMODULE_OPTION_NONE);
 #else
     handle = NSLinkModule(image, path, FALSE);
 #endif