diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2015-07-04 18:55:22 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2015-07-04 18:55:22 +0200 |
| commit | ce2cd89258a1c52e0ccd878165f2929718c99578 (patch) | |
| tree | a1d13ec4f41a67c1ebdc0174535240de757e851c /Zend/zend_extensions.c | |
| parent | 550bbf8f4614a5c868010195f562be3e9ee6bb00 (diff) | |
| download | php-git-ce2cd89258a1c52e0ccd878165f2929718c99578.tar.gz | |
Replace references to PHP_WIN32 and TSRM_WIN32 with ZEND_WIN32 in Zend/, this also fixes 1 instance of where fflush(stderr) was misplaced (zend_extensions.c)
Diffstat (limited to 'Zend/zend_extensions.c')
| -rw-r--r-- | Zend/zend_extensions.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c index 65d215d5eb..51d6a66adc 100644 --- a/Zend/zend_extensions.c +++ b/Zend/zend_extensions.c @@ -35,12 +35,12 @@ int zend_load_extension(const char *path) if (!handle) { #ifndef ZEND_WIN32 fprintf(stderr, "Failed loading %s: %s\n", path, DL_ERROR()); -/* See http://support.microsoft.com/kb/190351 */ -#ifdef PHP_WIN32 - fflush(stderr); -#endif #else fprintf(stderr, "Failed loading %s\n", path); + /* See http://support.microsoft.com/kb/190351 */ +#ifdef ZEND_WIN32 + fflush(stderr); +#endif #endif return FAILURE; } @@ -56,7 +56,7 @@ int zend_load_extension(const char *path) if (!extension_version_info || !new_extension) { fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path); /* See http://support.microsoft.com/kb/190351 */ -#ifdef PHP_WIN32 +#ifdef ZEND_WIN32 fflush(stderr); #endif DL_UNLOAD(handle); @@ -73,7 +73,7 @@ int zend_load_extension(const char *path) extension_version_info->zend_extension_api_no, ZEND_EXTENSION_API_NO); /* See http://support.microsoft.com/kb/190351 */ -#ifdef PHP_WIN32 +#ifdef ZEND_WIN32 fflush(stderr); #endif DL_UNLOAD(handle); @@ -89,7 +89,7 @@ int zend_load_extension(const char *path) new_extension->URL, new_extension->name); /* See http://support.microsoft.com/kb/190351 */ -#ifdef PHP_WIN32 +#ifdef ZEND_WIN32 fflush(stderr); #endif DL_UNLOAD(handle); @@ -100,7 +100,7 @@ int zend_load_extension(const char *path) fprintf(stderr, "Cannot load %s - it was built with configuration %s, whereas running engine is %s\n", new_extension->name, extension_version_info->build_id, ZEND_EXTENSION_BUILD_ID); /* See http://support.microsoft.com/kb/190351 */ -#ifdef PHP_WIN32 +#ifdef ZEND_WIN32 fflush(stderr); #endif DL_UNLOAD(handle); @@ -108,7 +108,7 @@ int zend_load_extension(const char *path) } else if (zend_get_extension(new_extension->name)) { fprintf(stderr, "Cannot load %s - it was already loaded\n", new_extension->name); /* See http://support.microsoft.com/kb/190351 */ -#ifdef PHP_WIN32 +#ifdef ZEND_WIN32 fflush(stderr); #endif DL_UNLOAD(handle); @@ -119,7 +119,7 @@ int zend_load_extension(const char *path) #else fprintf(stderr, "Extensions are not supported on this platform.\n"); /* See http://support.microsoft.com/kb/190351 */ -#ifdef PHP_WIN32 +#ifdef ZEND_WIN32 fflush(stderr); #endif return FAILURE; |