diff options
author | Ryan Bloom <rbb@apache.org> | 2000-05-16 01:02:57 +0200 |
---|---|---|
committer | Ryan Bloom <rbb@apache.org> | 2000-05-16 01:02:57 +0200 |
commit | 70a78920f40faa2e28ccb0bac2fea9bd18a889ee (patch) | |
tree | 66cc39892ae17e509aa0f831149f91e7367241e8 /os/unix | |
parent | Make mod_so use ap_strerror instead of the old ap_os_dso_error. The (diff) | |
download | apache2-70a78920f40faa2e28ccb0bac2fea9bd18a889ee.tar.xz apache2-70a78920f40faa2e28ccb0bac2fea9bd18a889ee.zip |
Remove the dso code from the os/unix directory. These functions are not
used in Apache anymore because they are part of apr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85219 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os/unix')
-rw-r--r-- | os/unix/Makefile.in | 2 | ||||
-rw-r--r-- | os/unix/os.h | 54 |
2 files changed, 1 insertions, 55 deletions
diff --git a/os/unix/Makefile.in b/os/unix/Makefile.in index b41c15c5e6..3f95e080a7 100644 --- a/os/unix/Makefile.in +++ b/os/unix/Makefile.in @@ -1,5 +1,5 @@ LTLIBRARY_NAME = libos.la -LTLIBRARY_SOURCES = os.c os-inline.c unixd.c iol_socket.c +LTLIBRARY_SOURCES = os-inline.c unixd.c iol_socket.c include $(top_srcdir)/build/ltlib.mk diff --git a/os/unix/os.h b/os/unix/os.h index 0616446a3f..136a8f7e05 100644 --- a/os/unix/os.h +++ b/os/unix/os.h @@ -97,58 +97,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 - */ - -#ifdef HAVE_DL_H -#include <dl.h> -#endif - -/* - * Do not use native AIX DSO support on releases of AIX prior - * to V4.3 - */ -#ifdef AIX -#if AIX < 43 -#undef HAVE_DLFCN_H -#endif -#endif - -#ifdef HAVE_DLFCN_H -#include <dlfcn.h> -#else -void *dlopen(const char *, int); -int dlclose(void *); -void *dlsym(void *, const char *); -const char *dlerror(void); -#endif - -/* probably on an older system that doesn't support RTLD_NOW or RTLD_LAZY. - * The below define is a lie since we are really doing RTLD_LAZY since the - * system doesn't support RTLD_NOW. - */ -#ifndef RTLD_NOW -#define RTLD_NOW 1 -#endif - -#ifndef RTLD_GLOBAL -#define RTLD_GLOBAL 0 -#endif - -#if (defined(__FreeBSD__) ||\ - defined(__OpenBSD__) ||\ - defined(__NetBSD__) ) && !defined(__ELF__) -#define DLSYM_NEEDS_UNDERSCORE -#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 *); -const char *ap_os_dso_error(void); - #endif /* !APACHE_OS_H */ |