cvs commit: apache-1.3/src/os/unix os.h os.c

[rs...@hyperreal.org]

rse         98/09/15 23:49:47

  Modified:    src/os/unix os.h os.c
  Log:
  Fix our os-stuff after the Rapsody commit:
  - add prototype for the new ap_os_dso_init function (gcc complained)
  - fix a parse error: the #elif has to use defined(...) (gcc complained)
  - fix argument of ap_os_dso_init function (ANSI likes "void")
  
  Revision  Changes    Path
  1.32      +1 -0      apache-1.3/src/os/unix/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- os.h	1998/08/03 17:52:22	1.31
  +++ os.h	1998/09/16 06:49:44	1.32
  @@ -126,6 +126,7 @@
   #endif
   
   #define     ap_os_dso_handle_t  void *
  +void        ap_os_dso_init(void);
   void *      ap_os_dso_load(const char *);
   void        ap_os_dso_unload(void *);
   void *      ap_os_dso_sym(void *, const char *);
  
  
  
  1.15      +3 -3      apache-1.3/src/os/unix/os.c
  
  Index: os.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- os.c	1998/09/15 19:47:44	1.14
  +++ os.c	1998/09/16 06:49:44	1.15
  @@ -73,9 +73,9 @@
       abort();
   }
   
  -#endif
  +#endif /*RHAPSODY*/
   
  -void ap_os_dso_init()
  +void ap_os_dso_init(void)
   {
   #if defined(RHAPSODY)
       NSLinkEditErrorHandlers handlers;
  @@ -146,7 +146,7 @@
       free(symname2);
       return NSAddressOfSymbol(symbol);
   
  -#elif DLSYM_NEEDS_UNDERSCORE
  +#elif defined(DLSYM_NEEDS_UNDERSCORE)
       char *symbol = (char*)malloc(sizeof(char)*(strlen(symname)+2));
       void *retval;
       sprintf(symbol, "_%s", symname);