[PHP4BETA] CVS update: php4/win32

Date: Friday April 23, 1999 @ 16:06 Author: zeev Update of /repository/php4/win32 In directory php:/tmp/cvs-serv23554/win32 Modified Files: pwd.c sendmail.c time.c winutil.c wsyslog.c Log Message: Remove tls.[ch] Index: php4/win32/pwd.c diff -u php4/win32/pwd.c:1.1.1.1 php4/win32/pwd.c:1.2 --- php4/win32/pwd.c:1.1.1.1 Wed Apr 7 17:05:12 1999 +++ php4/win32/pwd.c Fri Apr 23 16:06:01 1999 @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Header: /local/repository/php4/win32/pwd.c,v 1.1.1.1 1999/04/07 21:05:12 zeev Exp $ + $Header: /local/repository/php4/win32/pwd.c,v 1.2 1999/04/23 20:06:01 zeev Exp $ */ /* This 'implementation' is conjectured from the use of this functions in @@ -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> Index: php4/win32/sendmail.c diff -u php4/win32/sendmail.c:1.2 php4/win32/sendmail.c:1.3 --- php4/win32/sendmail.c:1.2 Sat Apr 10 09:32:47 1999 +++ php4/win32/sendmail.c Fri Apr 23 16:06:01 1999 @@ -18,9 +18,6 @@ * */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" /*php specific */ #include <stdio.h> #include <stdlib.h> Index: php4/win32/time.c diff -u php4/win32/time.c:1.1.1.1 php4/win32/time.c:1.2 --- php4/win32/time.c:1.1.1.1 Wed Apr 7 17:05:12 1999 +++ php4/win32/time.c Fri Apr 23 16:06:01 1999 @@ -13,9 +13,7 @@ /* Include stuff ************************************************************ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif + #include "time.h" #include "unistd.h" #include "signal.h" Index: php4/win32/winutil.c diff -u php4/win32/winutil.c:1.1.1.1 php4/win32/winutil.c:1.2 --- php4/win32/winutil.c:1.1.1.1 Wed Apr 7 17:05:12 1999 +++ php4/win32/winutil.c Fri Apr 23 16:06:01 1999 @@ -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 @@ 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; } Index: php4/win32/wsyslog.c diff -u php4/win32/wsyslog.c:1.1.1.1 php4/win32/wsyslog.c:1.2 --- php4/win32/wsyslog.c:1.1.1.1 Wed Apr 7 17:05:13 1999 +++ php4/win32/wsyslog.c Fri Apr 23 16:06:01 1999 @@ -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> -- PHP 4 Beta