join 1.1c6

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1dev@310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 5 deletions

diff --git a/dln.c b/dln.c
index a52b9c68ca..dc66b5394f 100644
--- a/dln.c
+++ b/dln.c
@@ -72,7 +72,7 @@ char *getenv();
 
 int eaccess();
 
-#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT)
+#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(__CYGWIN32__) && !defined(_AIX)
 /* dynamic load with dlopen() */
 # define USE_DLN_DLOPEN
 #endif
@@ -1081,7 +1081,7 @@ dln_sym(name)
 #include "dl.h"
 #endif
 
-#ifdef _AIX
+#if defined(_AIX)
 #include <ctype.h>	/* for isdigit()	*/
 #include <errno.h>	/* for global errno	*/
 #include <sys/ldr.h>
@@ -1143,7 +1143,7 @@ dln_strerror()
 }
 
 
-#ifdef _AIX
+#if defined(_AIX)
 static void
 aix_loaderror(char *pathname)
 {
@@ -1257,7 +1257,7 @@ dln_load(file)
 # endif
 
 	/* Load file */
-	if ((handle = dlopen(file, RTLD_LAZY|RTLD_GLOBAL)) == NULL) {
+	if ((handle = (void*)dlopen(file, RTLD_LAZY|RTLD_GLOBAL)) == NULL) {
 	    goto failed;
 	}
 
@@ -1296,7 +1296,7 @@ dln_load(file)
     }
 #endif /* hpux */
 
-#ifdef _AIX
+#if defined(_AIX)
 #define DLN_DEFINED
     {
 	void (*init_fct)();