[PHP-DEV] CVS update: php31/main From: shane (php-dev <email protected>)
Date: 05/31/98

Date: Sunday May 31, 1998 @ 18:48
Author: shane

Update of /repository/php31/main
In directory asf:/tmp/cvs-serv1132/main

Modified Files:
        main.c php.h
Log Message:
A couple minor fixes to get things back to right with thread safe version.

Index: php31/main/main.c
diff -c php31/main/main.c:1.18 php31/main/main.c:1.19
*** php31/main/main.c:1.18 Sun May 31 18:10:47 1998
--- php31/main/main.c Sun May 31 18:48:04 1998
***************
*** 29,35 ****
     +----------------------------------------------------------------------+
   */
  
! /* $Id: main.c,v 1.18 1998/05/31 22:10:47 shane Exp $ */
  
  /* #define CRASH_DETECTION */
  
--- 29,35 ----
     +----------------------------------------------------------------------+
   */
  
! /* $Id: main.c,v 1.19 1998/05/31 22:48:04 shane Exp $ */
  
  /* #define CRASH_DETECTION */
  
***************
*** 139,145 ****
  {
          va_list args;
          char buffer[1024];
! TLS_VARS;
  
          va_start(args, format);
          vsprintf(buffer, format, args);
--- 139,146 ----
  {
          va_list args;
          char buffer[1024];
! php3_globals_struct *php3_globals;
! PHP3_TLS_GET(TlsIndex,php3_globals);
  
          va_start(args, format);
          vsprintf(buffer, format, args);
***************
*** 1309,1315 ****
  #ifdef THREAD_SAFE
          php3_globals_struct *php3_globals;
  #endif
! #if WIN32_WINNT
          _fmode = _O_BINARY; /*sets default for file streams to binary */
          /* make the stdio mode be binary */
          setmode(_fileno(stdin), O_BINARY);
--- 1310,1316 ----
  #ifdef THREAD_SAFE
          php3_globals_struct *php3_globals;
  #endif
! #if WIN32|WINNT
          _fmode = _O_BINARY; /*sets default for file streams to binary */
          /* make the stdio mode be binary */
          setmode(_fileno(stdin), O_BINARY);
Index: php31/main/php.h
diff -c php31/main/php.h:1.12 php31/main/php.h:1.13
*** php31/main/php.h:1.12 Sun May 31 18:10:47 1998
--- php31/main/php.h Sun May 31 18:48:04 1998
***************
*** 28,34 ****
     +----------------------------------------------------------------------+
   */
  
! /* $Id: php.h,v 1.12 1998/05/31 22:10:47 shane Exp $ */
  
  #ifndef _PHP_H
  #define _PHP_H
--- 28,34 ----
     +----------------------------------------------------------------------+
   */
  
! /* $Id: php.h,v 1.13 1998/05/31 22:48:04 shane Exp $ */
  
  #ifndef _PHP_H
  #define _PHP_H
***************
*** 84,92 ****
  # ifndef COMPILE_DL
  # define GLOBAL(a) php3_globals->a
  # define STATIC GLOBAL
  # define TLS_VARS php3_globals_struct *php3_globals;\
! if(!TlsIndex)OutputDebugString("Invalid TLSIndex!\n");\
           PHP3_TLS_GET(TlsIndex,php3_globals)
  extern TLS_T TlsIndex; /*global thread local storage index*/
  extern CRITICAL_SECT_T Tls_crit; /*tls critical section*/
  /*redirect variables to the flex structure*/
--- 84,98 ----
  # ifndef COMPILE_DL
  # define GLOBAL(a) php3_globals->a
  # define STATIC GLOBAL
+ #if defined(CRASH_DETECTION)
+ extern void debug_log(const char *format,...);
  # define TLS_VARS php3_globals_struct *php3_globals;\
! if(!TlsIndex)debug_log("%d:Invalid TLSIndex!\n",GetCurrentThreadId());\
           PHP3_TLS_GET(TlsIndex,php3_globals)
+ #else
+ # define TLS_VARS php3_globals_struct *php3_globals;\
+ PHP3_TLS_GET(TlsIndex,php3_globals)
+ #endif
  extern TLS_T TlsIndex; /*global thread local storage index*/
  extern CRITICAL_SECT_T Tls_crit; /*tls critical section*/
  /*redirect variables to the flex structure*/