Remove tls.[ch]

30 files changed, 14 insertions, 90 deletions

diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index 392f2451ac..3099934764 100644
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -28,9 +28,6 @@
  */
 /* $Id$ */
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include <string.h>
 
 #include "php.h"
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index e2865ac83f..92d3d6bcff 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -30,9 +30,7 @@
 
 
 #define HASH_OF(p) ((p)->type==IS_ARRAY ? (p)->value.ht : (((p)->type==IS_OBJECT ? (p)->value.obj.properties : NULL)))
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "internal_functions_registry.h"
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 4045a698a1..3fe1500708 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -27,9 +27,6 @@
    +----------------------------------------------------------------------+
  */
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #include "php3_browscap.h"
 #include "php_ini.h"
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 191371a8c2..3c0cf138b0 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -33,9 +33,6 @@
 /* $Id$ */
 
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #include "zend_operators.h"
 #include "datetime.h"
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 1edd10d374..546f31554b 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -29,9 +29,6 @@
 
 /* $Id$ */
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #include "fopen-wrappers.h"
 
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index e10ba466c1..60ae23c2d6 100644
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -29,9 +29,6 @@
    +----------------------------------------------------------------------+
  */
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #include "dl.h"
 #include "php_globals.h"
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 5a338856d0..2bec92bb88 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -30,9 +30,6 @@
 
 /* $Id$ */
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index af35ae131e..c4ea465c86 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -28,9 +28,6 @@
  */
 /* $Id$ */
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include <stdio.h>
 #include "php.h"
 #include <ctype.h>
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 86e499e28f..5e34d73795 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -27,9 +27,6 @@
    +----------------------------------------------------------------------+
  */
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #include "php_globals.h"
 #include "ext/standard/flock_compat.h"
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 98a6156353..bd539e1d5d 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -28,9 +28,7 @@
  */
 
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include "php.h"
 #include "safe_mode.h"
 #include "fopen-wrappers.h"
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 956f0071fd..4efb949292 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -30,9 +30,6 @@
 /* $Id$ */
 
 #include <math.h>				/* modf() */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #include "ext/standard/head.h"
 #include "php3_string.h"
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index 6e210281cf..c699136ceb 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -28,9 +28,7 @@
    +----------------------------------------------------------------------+
 */
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include "php.h"
 #include <stdlib.h>
 #if HAVE_UNISTD_H
diff --git a/ext/standard/head.c b/ext/standard/head.c
index 70429bee34..6c2772a547 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -27,9 +27,7 @@
    +----------------------------------------------------------------------+
  */
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include <stdio.h>
 #include "php.h"
 #include "ext/standard/php3_standard.h"
diff --git a/ext/standard/html.c b/ext/standard/html.c
index f15131523d..49baf94b41 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -28,9 +28,6 @@
    +----------------------------------------------------------------------+
  */
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #include "reg.h"
 #include "html.h"
diff --git a/ext/standard/info.c b/ext/standard/info.c
index b6e5ac26fc..cfcf15a06c 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -27,9 +27,7 @@
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
  */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "php_globals.h"
diff --git a/ext/standard/link.c b/ext/standard/link.c
index 57af8dbe87..6cf79471f4 100644
--- a/ext/standard/link.c
+++ b/ext/standard/link.c
@@ -29,9 +29,7 @@
  */
 
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include "php.h"
 #include "php3_filestat.h"
 #include "php_globals.h"
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 685e8d9cf9..af6820a869 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -33,9 +33,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdio.h>
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #ifndef MSVC5
 #include "build-defs.h"
diff --git a/ext/standard/math.c b/ext/standard/math.c
index e13fb82119..eb427941eb 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -28,9 +28,6 @@
    +----------------------------------------------------------------------+
  */
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #include "phpmath.h"
 #include "snprintf.h"
diff --git a/ext/standard/md5.c b/ext/standard/md5.c
index 23e2d54c4b..959b7dea9a 100644
--- a/ext/standard/md5.c
+++ b/ext/standard/md5.c
@@ -30,9 +30,6 @@
 /* 
  * md5.c - Copyright 1997 Lachlan Roche 
  */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 
 #include <stdio.h>
 #include "php.h"
diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
index 3ccf2a28a9..81e0694a58 100644
--- a/ext/standard/microtime.c
+++ b/ext/standard/microtime.c
@@ -36,9 +36,6 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 #include "microtime.h"
 #include "snprintf.h"
diff --git a/ext/standard/mime.c b/ext/standard/mime.c
index fdc794a87c..d6f71e57ac 100644
--- a/ext/standard/mime.c
+++ b/ext/standard/mime.c
@@ -27,9 +27,7 @@
    +----------------------------------------------------------------------+
  */
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include <stdio.h>
 #include "php.h"
 #include "ext/standard/php3_standard.h"
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 83fa1284d5..b6dfd1f5eb 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -27,9 +27,7 @@
    +----------------------------------------------------------------------+
  */
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include "php.h"
 
 #include <stdio.h>
diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c
index 2c072c7b35..18ef5df956 100644
--- a/ext/standard/pageinfo.c
+++ b/ext/standard/pageinfo.c
@@ -27,9 +27,7 @@
    +----------------------------------------------------------------------+
  */
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include "php.h"
 #include "pageinfo.h"
 
diff --git a/ext/standard/post.c b/ext/standard/post.c
index 224450990d..3520c0b3b1 100644
--- a/ext/standard/post.c
+++ b/ext/standard/post.c
@@ -27,9 +27,7 @@
    +----------------------------------------------------------------------+
  */
 /* $Id: */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include <stdio.h>
 #include "php.h"
 #include "php3_standard.h"
diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index 8b81e82e7f..4f37bf133a 100644
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -29,9 +29,7 @@
    +----------------------------------------------------------------------+
  */
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include <stdio.h>
 #include "php.h"
 #include "php3_string.h"
diff --git a/ext/standard/string.c b/ext/standard/string.c
index b05605275c..973081f02f 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -31,9 +31,7 @@
 
 
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include <stdio.h>
 #include "php.h"
 #include "reg.h"
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index 662aa08cfb..e1cdae36e4 100644
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -28,9 +28,7 @@
  */
 
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "zend_globals.h"
diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c
index 89988b3eca..548838fdf9 100644
--- a/ext/standard/uniqid.c
+++ b/ext/standard/uniqid.c
@@ -28,9 +28,7 @@
  */
 
 /* $Id$ */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
+
 #include "php.h"
 
 #include <stdlib.h>
diff --git a/ext/standard/url.c b/ext/standard/url.c
index df6e6171f6..4cd32961ea 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -34,9 +34,6 @@
 #include <sys/types.h>
 
 /* php.h includes the correct regex.h */
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include "php.h"
 
 #include "url.h"
diff --git a/ext/standard/var.c b/ext/standard/var.c
index feb277c4c3..7bf00519f5 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -27,9 +27,6 @@
    +----------------------------------------------------------------------+
  */
 
-#ifdef THREAD_SAFE
-#include "tls.h"
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>