Make Win32 compile again

diff --git a/Zend/zend.h b/Zend/zend.h
index ef39a00ebe89c2833429b516aaa950d089f2dea3..bfcf96d70aaf28a7ca6f6b651dc0cc8bae20ee6e 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -58,14 +58,20 @@
 #endif
 
 #if defined(HAVE_LIBDL) && defined(RTLD_NOW)
-# define DL_LOAD(libname)      dlopen(libname, RTLD_NOW)
-# define DL_UNLOAD             dlclose
-# define DL_FETCH_SYMBOL       dlsym
-# define DL_HANDLE             void *
-# define ZEND_EXTENSIONS_SUPPORT 1
+# define DL_LOAD(libname)                      dlopen(libname, RTLD_NOW)
+# define DL_UNLOAD                                     dlclose
+# define DL_FETCH_SYMBOL                       dlsym
+# define DL_HANDLE                                     void *
+# define ZEND_EXTENSIONS_SUPPORT       1
+#elif (WIN32||WINNT)
+# define DL_LOAD(libname)                      LoadLibrary(libname)
+# define DL_FETCH_SYMBOL                       GetProcAddress
+# define DL_UNLOAD                                     FreeLibrary
+# define DL_HANDLE                                     HMODULE
+# define ZEND_EXTENSIONS_SUPPORT       1
 #else
-# define DL_HANDLE             void *
-# define ZEND_EXTENSIONS_SUPPORT 0
+# define DL_HANDLE                                     void *
+# define ZEND_EXTENSIONS_SUPPORT       0
 #endif
 
 #if ZEND_DEBUG

diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index 4e6f23a555547665140cb14021185c990ae27939..8171727c2e6cc9462b379f5e5cdfce9a9f563b01 100644 (file)
--- a/Zend/zend_config.w32.h
+++ b/Zend/zend_config.w32.h
@@ -57,11 +57,6 @@ typedef unsigned int uint;
 # define inline
 #endif
 
-#define DL_LOAD(libname)       LoadLibrary(libname)
-#define DL_FETCH_SYMBOL                GetProcAddress
-#define DL_UNLOAD                      FreeLibrary
-#define DL_HANDLE                      HMODULE
-#define ZEND_EXTENSIONS_SUPPORT 1
 
 #ifdef LIBZEND_EXPORTS
 #      define ZEND_API __declspec(dllexport)