cvs commit: apr/test testdso.c

[jorton]

jorton      2002/11/26 23:54:30

  Modified:    test     testdso.c
  Log:
  Flatten conditionals; define LIB_NAME{,2} correctly on HP-UX.
  
  Revision  Changes    Path
  1.28      +11 -12    apr/test/testdso.c
  
  Index: testdso.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testdso.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- testdso.c 26 Nov 2002 16:10:59 -0000      1.27
  +++ testdso.c 27 Nov 2002 07:54:30 -0000      1.28
  @@ -66,18 +66,17 @@
   
   #ifdef NETWARE
   # define LIB_NAME "mod_test.nlm"
  -#else
  -# ifdef BEOS
  -#  define LIB_NAME "mod_test.so"
  -# else
  -#  ifdef DARWIN
  -#   define LIB_NAME ".libs/mod_test.so" 
  -#   define LIB_NAME2 ".libs/libmod_test.dylib" 
  -#  else
  -#   define LIB_NAME ".libs/mod_test.so"
  -#   define LIB_NAME2 ".libs/libmod_test.so"
  -#  endif
  -# endif
  +#elif defined(BEOS)
  +# define LIB_NAME "mod_test.so"
  +#elif defined(DARWIN)
  +# define LIB_NAME ".libs/mod_test.so" 
  +# define LIB_NAME2 ".libs/libmod_test.dylib" 
  +#elif defined(__hpux__)
  +# define LIB_NAME ".libs/mod_test.sl"
  +# define LIB_NAME2 ".libs/libmod_test.sl"
  +#else /* Every other Unix */
  +# define LIB_NAME ".libs/mod_test.so"
  +# define LIB_NAME2 ".libs/libmod_test.so"
   #endif
   
   static char *filename;