From apache-cvs-return-444-apmail-apache-cvs-archive=apache.org@apache.org Tue Apr 04 08:47:01 2000 Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 88212 invoked by uid 500); 4 Apr 2000 08:47:01 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 88199 invoked by uid 500); 4 Apr 2000 08:47:00 -0000 Delivered-To: apmail-apache-2.0-cvs@apache.org Date: 4 Apr 2000 08:46:59 -0000 Message-ID: <20000404084659.88194.qmail@locus.apache.org> From: dreid@locus.apache.org To: apache-2.0-cvs@apache.org Subject: cvs commit: apache-2.0/src/os/beos Makefile.in os.c os.h os-inline.c dreid 00/04/04 01:46:59 Modified: src/os/beos Makefile.in os.c os.h Removed: src/os/beos os-inline.c Log: Start cleaning up the beos directory. DSO stuff is now in APR. Revision Changes Path 1.3 +1 -1 apache-2.0/src/os/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/os/beos/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 2000/03/15 22:46:32 1.2 +++ Makefile.in 2000/04/04 08:46:58 1.3 @@ -5,6 +5,6 @@ VPATH = @srcdir@ LTLIBRARY_NAME = libos.la -LTLIBRARY_SOURCES = os.c os-inline.c beosd.c iol_socket.c +LTLIBRARY_SOURCES = os.c beosd.c iol_socket.c include $(top_srcdir)/build/ltlib.mk 1.6 +0 -47 apache-2.0/src/os/beos/os.c Index: os.c =================================================================== RCS file: /home/cvs/apache-2.0/src/os/beos/os.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- os.c 2000/03/31 09:17:09 1.5 +++ os.c 2000/04/04 08:46:58 1.6 @@ -68,50 +68,3 @@ { return file[0] == '/'; } - - -/* some linkers complain unless there's at least one function in each - * .o file... and extra prototype is for gcc -Wmissing-prototypes - */ -extern void ap_is_not_here(void); -void ap_is_not_here(void) {} - -/* - * Abstraction layer for loading - * Apache modules under run-time via - * dynamic shared object (DSO) mechanism - */ - -void ap_os_dso_init(void) -{ - /* Nothing required to be done! */ -} - -void* ap_os_dso_load(const char *path) -{ - return (void*) load_add_on(path); -} - -void ap_os_dso_unload(void* handle) -{ - unload_add_on((image_id)handle); -} - -void *ap_os_dso_sym(void *handle, const char *symname) -{ - void * retval = 0; -#if defined(DLSYM_NEEDS_UNDERSCORE) - char *symbol = (char*)malloc(sizeof(char)*(strlen(symname)+2)); - sprintf(symbol, "_%s", symname); - get_image_symbol((image_id)handle, symbol, B_SYMBOL_TYPE_ANY, (void **)&retval); - free(symbol); - return retval; -#endif - get_image_symbol((image_id)handle, symname, B_SYMBOL_TYPE_ANY, (void **)&retval); - return retval; -} - -const char *ap_os_dso_error(void) -{ - return NULL; -} 1.8 +0 -22 apache-2.0/src/os/beos/os.h Index: os.h =================================================================== RCS file: /home/cvs/apache-2.0/src/os/beos/os.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- os.h 2000/03/31 09:17:09 1.7 +++ os.h 2000/04/04 08:46:58 1.8 @@ -60,7 +60,6 @@ #define APACHE_OS_H #include "ap_config.h" -#include #ifndef PLATFORM #define PLATFORM "BeOS" @@ -78,26 +77,5 @@ #define ap_os_systemcase_filename(p,f) (f) #define ap_os_is_filename_valid(f) (1) #define ap_os_kill(pid, sig) kill(pid, sig) - -/* - * Abstraction layer for loading - * Apache modules under run-time via - * dynamic shared object (DSO) mechanism - */ - -void *dlopen(const char *, int); -int dlclose(void *); -void *dlsym(void *, const char *); -const char *dlerror(void); - -#define RTLD_NOW 1 -#define RTLD_GLOBAL 0 - -#define ap_os_dso_handle_t image_id * -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 *); -const char *ap_os_dso_error(void); #endif /* !APACHE_OS_H */