diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-02-15 19:11:48 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-02-15 19:11:48 +0000 |
| commit | 286dee810089613bdf6dd12a950fcb4dac5b8bd1 (patch) | |
| tree | e2724738db265bcc778d7fca11bc16c1f2331185 /TSRM | |
| parent | ea278e8566a9e32068747ed9f30579a3d6e40785 (diff) | |
| download | php-git-286dee810089613bdf6dd12a950fcb4dac5b8bd1.tar.gz | |
MFH
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.h | 9 | ||||
| -rw-r--r-- | TSRM/tsrm_config_common.h | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index b4309f6df6..5e3411b8f7 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -13,14 +13,11 @@ #ifndef TSRM_H #define TSRM_H -/* #ifndef WIN32 */ -#ifndef WIN32 -# include <tsrm_config.h> -#endif - -#ifdef WIN32 +#if !defined(__CYGWIN__) && defined(WIN32) # define TSRM_WIN32 # include "tsrm_config.w32.h" +#else +# include <tsrm_config.h> #endif #ifdef TSRM_WIN32 diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h index 62a7c8efc0..0c6a2a183f 100644 --- a/TSRM/tsrm_config_common.h +++ b/TSRM/tsrm_config_common.h @@ -1,8 +1,10 @@ #ifndef TSRM_CONFIG_COMMON_H #define TSRM_CONFIG_COMMON_H -#if WINNT|WIN32 -# define TSRM_WIN32 +#ifndef __CYGWIN__ +# if WINNT|WIN32 +# define TSRM_WIN32 +# endif #endif #ifdef TSRM_WIN32 |