From 9364b74c15c99af662854a89d479d30ababf77e6 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 2 May 2002 13:28:24 +0000 Subject: 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 --- dso/unix/dso.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'dso') 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 -- cgit v1.2.1