httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/include apr_dso.h
Date Tue, 04 Apr 2000 03:55:27 GMT
rbb         00/04/03 20:55:27

  Modified:    src/lib/apr configure.in
               src/lib/apr/dso/unix Makefile.in dso.c
               src/lib/apr/include apr_dso.h
  Log:
  Fix some minor bugs in the Unix dso code.  This works on Linux, but
  other Unix platforms will have different experiences.  Also, add dso
  back into the build process.
  
  Revision  Changes    Path
  1.64      +1 -1      apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- configure.in	2000/04/02 15:07:30	1.63
  +++ configure.in	2000/04/04 03:55:25	1.64
  @@ -15,7 +15,7 @@
   # These added to allow default directories to be used...
   DEFAULT_OSDIR="unix"
   echo "(Default will be ${DEFAULT_OSDIR})"
  -MODULES="file_io network_io threadproc misc locks time mmap shmem"
  +MODULES="file_io network_io threadproc misc locks time mmap shmem dso"
   
   dnl Process this file with autoconf to produce a configure script.
   AC_INIT(configure.in)
  
  
  
  1.4       +6 -10     apache-2.0/src/lib/apr/dso/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in	2000/04/02 14:24:33	1.3
  +++ Makefile.in	2000/04/04 03:55:26	1.4
  @@ -49,13 +49,9 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -getopt.o: getopt.c misc.h ../../include/apr_config.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_pools.h \
  - ../../include/apr_lib.h ../../include/apr_file_io.h \
  - ../../include/apr_getopt.h
  -start.o: start.c misc.h ../../include/apr_config.h \
  - ../../include/apr_general.h ../../include/apr.h \
  - ../../include/apr_errno.h ../../include/apr_pools.h \
  - ../../include/apr_lib.h ../../include/apr_file_io.h \
  - ../../include/apr_getopt.h
  +dso.o: dso.c dso.h $(INCDIR)/apr_config.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_dso.h
  
  
  
  1.9       +4 -3      apache-2.0/src/lib/apr/dso/unix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- dso.c	2000/04/03 19:44:18	1.8
  +++ dso.c	2000/04/04 03:55:26	1.9
  @@ -104,6 +104,7 @@
       if (dlclose(handle->handle) != 0)
           return APR_EINIT;
   #endif
  +    handle->handle = NULL;
   
       return APR_SUCCESS;
   }
  @@ -134,8 +135,8 @@
   
   
   #elif defined(DLSYM_NEEDS_UNDERSCORE)
  -    char *symbol = (char*)malloc(sizeof(char)*(strlen(symname)+2));
       void *retval;
  +    char *symbol = (char*)malloc(sizeof(char)*(strlen(symname)+2));
       sprintf(symbol, "_%s", symname);
       retval = dlsym(handle->handle, symbol);
       free(symbol);
  @@ -148,8 +149,8 @@
   
       if (retval == NULL)
           return APR_EINIT;
  -    
  -    ressym = retval;
  +
  +    *ressym = retval;
       
       return APR_SUCCESS;
   }
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/include/apr_dso.h
  
  Index: apr_dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_dso.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_dso.h	2000/04/03 18:37:05	1.5
  +++ apr_dso.h	2000/04/04 03:55:27	1.6
  @@ -63,7 +63,7 @@
   #endif
   
   typedef struct ap_dso_handle_t        ap_dso_handle_t;
  -typedef void *                     ap_dso_handle_sym_t;
  +typedef void *                        ap_dso_handle_sym_t;
   
   ap_status_t ap_dso_init(void);
   ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, 
  
  
  

Mime
View raw message