diff options
| author | Zeev Suraski <zeev@php.net> | 1999-04-23 20:06:01 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-04-23 20:06:01 +0000 |
| commit | 6f7c0edee361e15295b85ad6e03f3d109e446f22 (patch) | |
| tree | 550ea80544fd08641b418a1f783f62aa6c5745b8 /win32 | |
| parent | f53afa6eddaf46646f49e2579efbdf3dfb0d167e (diff) | |
| download | php-git-6f7c0edee361e15295b85ad6e03f3d109e446f22.tar.gz | |
Remove tls.[ch]
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/pwd.c | 3 | ||||
| -rw-r--r-- | win32/sendmail.c | 3 | ||||
| -rw-r--r-- | win32/time.c | 4 | ||||
| -rw-r--r-- | win32/winutil.c | 12 | ||||
| -rw-r--r-- | win32/wsyslog.c | 3 |
5 files changed, 3 insertions, 22 deletions
diff --git a/win32/pwd.c b/win32/pwd.c index e6d709d750..27194a7874 100644 --- a/win32/pwd.c +++ b/win32/pwd.c @@ -23,9 +23,6 @@ much useful things under MS-DOS, but using them avoids many "#ifdef MSDOS" in ported UN*X code ... */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" /*php specific */ #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/win32/sendmail.c b/win32/sendmail.c index b598a03b9c..2889676a90 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -18,9 +18,6 @@ * */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" /*php specific */ #include <stdio.h> #include <stdlib.h> diff --git a/win32/time.c b/win32/time.c index 1a50f87547..c48315e3e4 100644 --- a/win32/time.c +++ b/win32/time.c @@ -13,9 +13,7 @@ /* Include stuff ************************************************************ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif + #include "time.h" #include "unistd.h" #include "signal.h" diff --git a/win32/winutil.c b/win32/winutil.c index 0ac7e54703..d22aa308dc 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -1,9 +1,3 @@ -#ifdef THREAD_SAFE -#include "tls.h" -#else -#define TLS_VARS -#define GLOBAL(a) a -#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "winutil.h" @@ -14,16 +8,14 @@ static char Win_Error_msg[256]; char *php3_win_err(void) { - TLS_VARS; - FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - (LPTSTR) GLOBAL(Win_Error_msg), + (LPTSTR) Win_Error_msg, 256, NULL); - return GLOBAL(Win_Error_msg); + return Win_Error_msg; } diff --git a/win32/wsyslog.c b/win32/wsyslog.c index 4207370dbf..701eeed913 100644 --- a/win32/wsyslog.c +++ b/win32/wsyslog.c @@ -50,9 +50,6 @@ * Lift a leg, Yunie. Luv ya forever!!!! */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" /*php specific */ #include "syslog.h" #include <stdio.h> |