jim         02/05/02 06:28:24

  Modified:    dso/unix dso.c
  Log:
  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 :)
  
  Revision  Changes    Path
  1.54      +3 -2      apr/dso/unix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/unix/dso.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- dso.c	1 May 2002 23:23:02 -0000	1.53
  +++ dso.c	2 May 2002 13:28:24 -0000	1.54
  @@ -126,9 +126,10 @@
       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