Return-Path: Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 49026 invoked by uid 500); 1 May 2002 23:02:07 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 49014 invoked from network); 1 May 2002 23:02:06 -0000 From: Jim Jagielski Message-Id: <200205012302.TAA07151@devsys.jaguNET.com> Subject: Re: cvs commit: apr/dso/unix dso.c To: dev@apr.apache.org Date: Wed, 1 May 2002 19:02:02 -0400 (EDT) Cc: apr-cvs@apache.org Reply-To: jim@jaguNET.com In-Reply-To: from "wsanchez@apache.org" at May 01, 2002 10:50:45 PM X-Mailer: ELM [version 2.5 PL5] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N wsanchez@apache.org wrote: > > wsanchez 02/05/01 15:50:45 > > Modified: dso/unix dso.c > Log: > Or'ing NSLINKMODULE_OPTION_NONE is verbose. But still valid and makes the setting explicit. Plus, I think the below is wrong (handle vs os_handle) > Darwin comment is true on all platforms. > > Revision Changes Path > 1.51 +3 -11 apr/dso/unix/dso.c > > Index: dso.c > =================================================================== > RCS file: /home/cvs/apr/dso/unix/dso.c,v > retrieving revision 1.50 > retrieving revision 1.51 > diff -u -r1.50 -r1.51 > --- dso.c 22 Apr 2002 13:15:48 -0000 1.50 > +++ dso.c 1 May 2002 22:50:45 -0000 1.51 > @@ -126,18 +126,10 @@ > 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); > } > > > > -- =========================================================================== Jim Jagielski [|] jim@jaguNET.com [|] http://www.jaguNET.com/ "A society that will trade a little liberty for a little order will lose both and deserve neither" - T.Jefferson