diff options
| author | Anatol Belski <ab@php.net> | 2014-02-24 10:13:11 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-02-24 10:13:11 +0100 |
| commit | 60ed3f78bdab82b21c67b12ecd31ff7fd710e4f2 (patch) | |
| tree | 461674fc284c24319387c4677b084f553f893b77 | |
| parent | a97ae8bc06dfd5e89932fa49f7a09acf5e555e6c (diff) | |
| parent | bca0e5edd5b80990b36e611da59ee32b6a0a0161 (diff) | |
| download | php-git-60ed3f78bdab82b21c67b12ecd31ff7fd710e4f2.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed macro
| -rw-r--r-- | TSRM/tsrm_config_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h index 83b6b9b02c..eba9c13488 100644 --- a/TSRM/tsrm_config_common.h +++ b/TSRM/tsrm_config_common.h @@ -2,7 +2,7 @@ #define TSRM_CONFIG_COMMON_H #ifndef __CYGWIN__ -# if WINNT|WIN32 +# ifdef _WIN32 # define TSRM_WIN32 # endif #endif |