apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@jaguNET.com>
Subject Re: cvs commit: apr/dso/unix dso.c
Date Wed, 01 May 2002 23:02:02 GMT
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

Mime
View raw message