You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/05/16 01:02:59 UTC
cvs commit: apache-2.0/src/os/unix Makefile.in os.h os.c
rbb 00/05/15 16:02:58
Modified: src/os/unix Makefile.in os.h
Removed: src/os/unix os.c
Log:
Remove the dso code from the os/unix directory. These functions are not
used in Apache anymore because they are part of apr.
Revision Changes Path
1.4 +1 -1 apache-2.0/src/os/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 2000/04/30 00:06:07 1.3
+++ Makefile.in 2000/05/15 23:02:57 1.4
@@ -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
1.10 +0 -54 apache-2.0/src/os/unix/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/os.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- os.h 2000/03/31 09:17:16 1.9
+++ os.h 2000/05/15 23:02:57 1.10
@@ -97,58 +97,4 @@
#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 */