- OS X support for dynamically loaded extensions. (patch by Marko)

# NEWS entry coming up..

diff --git a/configure.in b/configure.in
index 6ed5af88f27f002b7406c69d2bb71b42699b56cc..c3e975b4d0b7c55d05f6b8aa4a83feffeac2d9a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -379,6 +379,7 @@ ieeefp.h \
 langinfo.h \
 limits.h \
 locale.h \
+mach-o/dyld.h \
 netinet/in.h \
 pwd.h \
 resolv.h \

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index fae9ef4fbcfe288ca51870c1c295ebaedc5e6bbe..6152f56deb6be31667274948eda8c30e54641280 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -30,7 +30,7 @@
 #include "build-defs.h"
 #endif
 
-#ifdef HAVE_LIBDL
+#if defined(HAVE_LIBDL) || HAVE_MACH_O_DYLD_H
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -45,10 +45,10 @@
 #define GET_DL_ERROR() php_win_err()
 #else
 #include <sys/param.h>
-#define GET_DL_ERROR() dlerror()
+#define GET_DL_ERROR() DL_ERROR()
 #endif
 
-#endif
+#endif /* defined(HAVE_LIBDL) || HAVE_MACH_O_DYLD_H */
 
 
 /* {{{ proto int dl(string extension_filename)
@@ -83,7 +83,7 @@ PHP_FUNCTION(dl)
 /* }}} */
 
 
-#ifdef HAVE_LIBDL
+#if defined(HAVE_LIBDL) || HAVE_MACH_O_DYLD_H
 
 #ifdef ZTS
 #define USING_ZTS 1