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

diff --git a/os/unix/Makefile.in b/os/unix/Makefile.in
index b41c15c5e6116d11eeaa2eb9f024025a57da9a0d..3f95e080a798f2319a358afae02de39a7bb53580 100644 (file)
--- 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 0616446a3fdbd50fe06929ec3adee7a0e96694e2..136a8f7e0559a06a2c472a7e6b47265cc70dcf6f 100644 (file)
--- 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 */