diff options
| author | Anatol Belski <ab@php.net> | 2014-02-24 10:12:50 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-02-24 10:12:50 +0100 |
| commit | bca0e5edd5b80990b36e611da59ee32b6a0a0161 (patch) | |
| tree | deb3c73404680ab2ac2afbc7a949d1b68117bc9d | |
| parent | 2198bbce868e8a3423e05c573ab4f69417ef5b88 (diff) | |
| parent | c6a4a7cad6ee80176047cbd874788235838f5c8b (diff) | |
| download | php-git-bca0e5edd5b80990b36e611da59ee32b6a0a0161.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 |