diff options
| author | Zeev Suraski <zeev@php.net> | 2000-01-13 20:34:45 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-01-13 20:34:45 +0000 |
| commit | f24931222c0df9b38de08f99f894136be2d9f533 (patch) | |
| tree | aaa0d7589d12194513f826fa36fc35cc242d9b43 | |
| parent | 3f74baed0291e746d9b8da208d30a4f32b741504 (diff) | |
| download | php-git-f24931222c0df9b38de08f99f894136be2d9f533.tar.gz | |
Make Win32 compile again
| -rw-r--r-- | Zend/zend.h | 20 | ||||
| -rw-r--r-- | Zend/zend_config.w32.h | 5 |
2 files changed, 13 insertions, 12 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index ef39a00ebe..bfcf96d70a 100644 --- 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 4e6f23a555..8171727c2e 100644 --- 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) |