diff options
author | David Reid <dreid@apache.org> | 2000-04-04 10:46:58 +0200 |
---|---|---|
committer | David Reid <dreid@apache.org> | 2000-04-04 10:46:58 +0200 |
commit | 1fa11f8df9ea3b25fc96cc5a82ef7f6743292f06 (patch) | |
tree | b54fa424ca091f5db4391b3fef4dc852a6281ce8 | |
parent | Tidy up the beos mpm files. (diff) | |
download | apache2-1fa11f8df9ea3b25fc96cc5a82ef7f6743292f06.tar.xz apache2-1fa11f8df9ea3b25fc96cc5a82ef7f6743292f06.zip |
Start cleaning up the beos directory. DSO stuff is now in APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84901 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | os/beos/Makefile.in | 2 | ||||
-rw-r--r-- | os/beos/os.c | 47 | ||||
-rw-r--r-- | os/beos/os.h | 22 |
3 files changed, 1 insertions, 70 deletions
diff --git a/os/beos/Makefile.in b/os/beos/Makefile.in index d9b0c41068..b2014e4c56 100644 --- a/os/beos/Makefile.in +++ b/os/beos/Makefile.in @@ -5,6 +5,6 @@ srcdir = @srcdir@ 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 diff --git a/os/beos/os.c b/os/beos/os.c index c61dc8b315..9b2f647dcf 100644 --- a/os/beos/os.c +++ b/os/beos/os.c @@ -68,50 +68,3 @@ int ap_os_is_path_absolute(const char *file) { 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; -} diff --git a/os/beos/os.h b/os/beos/os.h index 3c634f3adc..20560c1a58 100644 --- a/os/beos/os.h +++ b/os/beos/os.h @@ -60,7 +60,6 @@ #define APACHE_OS_H #include "ap_config.h" -#include <kernel/image.h> #ifndef PLATFORM #define PLATFORM "BeOS" @@ -79,25 +78,4 @@ extern int ap_os_is_path_absolute(const char *file); #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 */ |