nobu	2008-01-11 11:50:38 +0900 (Fri, 11 Jan 2008)

  New Revision: 14986

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/dln.c

  Log:
    * dln.c: use dlopen on Mac OS X 10.3 or later.  backport from trunk.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14986&r2=14985&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/dln.c?r1=14986&r2=14985&diff_format=u

Index: ruby_1_8/dln.c
===================================================================
--- ruby_1_8/dln.c	(revision 14985)
+++ ruby_1_8/dln.c	(revision 14986)
@@ -81,19 +81,28 @@
 # include "macruby_private.h"
 #endif
 
+#if defined(__APPLE__) && defined(__MACH__)   /* Mac OS X */
+# if defined(HAVE_DLOPEN)
+   /* Mac OS X with dlopen (10.3 or later) */
+#  define MACOSX_DLOPEN
+# else
+#  define MACOSX_DYLD
+# endif
+#endif
+
 #ifdef __BEOS__
 # include <image.h>
 #endif
 
 #ifndef NO_DLN_LOAD
 
-#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(__APPLE__) && !defined(_UNICOSMP)
+#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(MACOSX_DYLD) && !defined(_UNICOSMP)
 /* dynamic load with dlopen() */
 # define USE_DLN_DLOPEN
 #endif
 
 #ifndef FUNCNAME_PATTERN
-# if defined(__hp9000s300) ||  (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__)
+# if defined(__hp9000s300) ||  (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
 #  define FUNCNAME_PATTERN "_Init_%s"
 # else
 #  define FUNCNAME_PATTERN "Init_%s"
@@ -1141,7 +1150,7 @@
 #endif
 #endif
 #else
-#ifdef __APPLE__
+#ifdef MACOSX_DYLD
 #include <mach-o/dyld.h>
 #endif
 #endif
@@ -1403,7 +1412,7 @@
     }
 #endif /* _AIX */
 
-#if defined(NeXT) || defined(__APPLE__)
+#if defined(NeXT) || defined(MACOSX_DYLD)
 #define DLN_DEFINED
 /*----------------------------------------------------
    By SHIROYAMA Takayuki Psi@f...
@@ -1527,7 +1536,7 @@
     }
 #endif /* __BEOS__*/
 
-#ifdef __MACOS__
+#ifdef __MACOS__   /* Mac OS 9 or before */
 # define DLN_DEFINED
     {
       OSErr err;
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 14985)
+++ ruby_1_8/ChangeLog	(revision 14986)
@@ -1,5 +1,7 @@
-Fri Jan 11 10:24:03 2008  Nobuyoshi Nakada  <nobu@r...>
+Fri Jan 11 11:50:36 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* dln.c: use dlopen on Mac OS X 10.3 or later.  backport from trunk.
+
 	* lib/rdoc/options.rb (check_diagram): more precise check, darwin
 	  is not Windows but minwg is on it.
 

--
ML: ruby-changes@q...
Info: