diff options
| author | Andi Gutmans <andi@php.net> | 2000-09-02 16:28:50 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-09-02 16:28:50 +0000 |
| commit | 77b55ad07dc17e812f158e2183d44fb32f9e4b7d (patch) | |
| tree | 28dda28c39e900afa3894c9639914b9acf641ca2 /TSRM | |
| parent | 570e7e9a137f1c008e68ac2d4b924640174d2884 (diff) | |
| download | php-git-77b55ad07dc17e812f158e2183d44fb32f9e4b7d.tar.gz | |
- Revert change of defining TSRM_WIN32 in dsp
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.dsp | 6 | ||||
| -rw-r--r-- | TSRM/TSRM.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/TSRM/TSRM.dsp b/TSRM/TSRM.dsp index 699e433a36..0a1ead51ca 100644 --- a/TSRM/TSRM.dsp +++ b/TSRM/TSRM.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Debug_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "C:\Projects\TSRM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D "TSRM_WIN32" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x40d /d "_DEBUG" # ADD RSC /l 0x40d /d "_DEBUG" BSC32=bscmake.exe @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Release_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D "TSRM_WIN32" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x40d /d "NDEBUG" # ADD RSC /l 0x40d /d "NDEBUG" BSC32=bscmake.exe @@ -88,7 +88,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Release_TS_inline" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "TSRM_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D "TSRM_WIN32" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x40d /d "NDEBUG" # ADD RSC /l 0x40d /d "NDEBUG" BSC32=bscmake.exe diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 4957aba728..b68f07b133 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -24,6 +24,10 @@ /* Only compile multi-threading functions if we're in ZTS mode */ #ifdef ZTS +#ifdef WIN32 +# define TSRM_WIN32 +#endif + #ifdef TSRM_WIN32 # include <windows.h> #elif defined(GNUPTH) |