You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@hyperreal.org on 1999/12/09 20:21:58 UTC
cvs commit: apache-1.3/src/os/unix os.h os.c
stoddard 99/12/09 11:21:58
Modified: src/support httpd.exp
src/os/unix os.h os.c
Log:
More AIX DSO tweaking. Apache's AIX DSO emulation code does not work with
64 bit builds of Apache. Use native DSO support with AIX V4.3 and later.
Native AIX DSO support is broken prior to 4.3, so we need to continue
using Apache's version on pre 4.3 releases of AIX
PR: 5309
Submitted by: Chris Graham (chrisg@webwombat.com.au)
Reviewed by: Bill Stoddard
Revision Changes Path
1.29 +1 -1 apache-1.3/src/support/httpd.exp
Index: httpd.exp
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/httpd.exp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- httpd.exp 1999/09/09 18:12:13 1.28
+++ httpd.exp 1999/12/09 19:21:51 1.29
@@ -1,4 +1,4 @@
-#!
+#! .
ap_MD5Encode
ap_MD5Final
ap_MD5Init
1.42 +4 -1 apache-1.3/src/os/unix/os.h
Index: os.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- os.h 1999/05/04 02:57:14 1.41
+++ os.h 1999/12/09 19:21:55 1.42
@@ -104,10 +104,13 @@
#endif
/*
- * Do not use native AIX DSO support
+ * Do not use native AIX DSO support on releases of AIX prior
+ * to 4.3.
*/
#ifdef AIX
+#if AIX < 43
#undef HAVE_DLFCN_H
+#endif
#endif
#ifdef HAVE_DLFCN_H
1.19 +4 -1 apache-1.3/src/os/unix/os.c
Index: os.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- os.c 1999/10/13 02:38:20 1.18
+++ os.c 1999/12/09 19:21:56 1.19
@@ -14,10 +14,13 @@
void ap_is_not_here(void) {}
/*
- * Insert the DSO emulation code for AIX
+ * Insert the DSO emulation code for AIX for releases of AIX prior
+ * to 4.3. Use the native DSO code for 4.3 and later.
*/
#ifdef AIX
+#if AIX < 43
#include "os-aix-dso.c"
+#endif
#endif
/*