[PHP4BETA] CVS update: php4/ext/standard

Date: Friday April 23, 1999 @ 16:06 Author: zeev Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv23554/ext/standard Modified Files: base64.c basic_functions.c browscap.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c formatted_print.c fsock.c head.c html.c info.c link.c mail.c math.c md5.c microtime.c mime.c pack.c pageinfo.c post.c reg.c string.c syslog.c uniqid.c url.c var.c Log Message: Remove tls.[ch] Index: php4/ext/standard/base64.c diff -u php4/ext/standard/base64.c:1.1 php4/ext/standard/base64.c:1.2 --- php4/ext/standard/base64.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/base64.c Fri Apr 23 16:05:59 1999 @@ -26,11 +26,8 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.c,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: base64.c,v 1.2 1999/04/23 20:05:59 zeev Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include <string.h> #include "php.h" Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.5 php4/ext/standard/basic_functions.c:1.6 --- php4/ext/standard/basic_functions.c:1.5 Wed Apr 21 22:48:25 1999 +++ php4/ext/standard/basic_functions.c Fri Apr 23 16:05:59 1999 @@ -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" Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.1 php4/ext/standard/browscap.c:1.2 --- php4/ext/standard/browscap.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/browscap.c Fri Apr 23 16:05:59 1999 @@ -27,9 +27,6 @@ +----------------------------------------------------------------------+ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" #include "php3_browscap.h" #include "php_ini.h" Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.2 php4/ext/standard/datetime.c:1.3 --- php4/ext/standard/datetime.c:1.2 Wed Apr 21 13:11:01 1999 +++ php4/ext/standard/datetime.c Fri Apr 23 16:05:59 1999 @@ -30,12 +30,9 @@ */ -/* $Id: datetime.c,v 1.2 1999/04/21 17:11:01 sas Exp $ */ +/* $Id: datetime.c,v 1.3 1999/04/23 20:05:59 zeev Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" #include "zend_operators.h" #include "datetime.h" Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.1 php4/ext/standard/dir.c:1.2 --- php4/ext/standard/dir.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/dir.c Fri Apr 23 16:05:59 1999 @@ -27,11 +27,8 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: dir.c,v 1.2 1999/04/23 20:05:59 zeev Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" #include "fopen-wrappers.h" Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.1 php4/ext/standard/dl.c:1.2 --- php4/ext/standard/dl.c:1.1 Wed Apr 21 20:25:56 1999 +++ php4/ext/standard/dl.c Fri Apr 23 16:05:59 1999 @@ -29,9 +29,6 @@ +----------------------------------------------------------------------+ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" #include "dl.h" #include "php_globals.h" Index: php4/ext/standard/dns.c diff -u php4/ext/standard/dns.c:1.1 php4/ext/standard/dns.c:1.2 --- php4/ext/standard/dns.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/dns.c Fri Apr 23 16:05:59 1999 @@ -28,11 +28,8 @@ +----------------------------------------------------------------------+ */ -/* $Id: dns.c,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: dns.c,v 1.2 1999/04/23 20:05:59 zeev Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" #if HAVE_SYS_SOCKET_H #include <sys/socket.h> Index: php4/ext/standard/exec.c diff -u php4/ext/standard/exec.c:1.4 php4/ext/standard/exec.c:1.5 --- php4/ext/standard/exec.c:1.4 Wed Apr 21 20:25:56 1999 +++ php4/ext/standard/exec.c Fri Apr 23 16:05:59 1999 @@ -26,11 +26,8 @@ | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.4 1999/04/22 00:25:56 ssb Exp $ */ +/* $Id: exec.c,v 1.5 1999/04/23 20:05:59 zeev Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include <stdio.h> #include "php.h" #include <ctype.h> Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.7 php4/ext/standard/file.c:1.8 --- php4/ext/standard/file.c:1.7 Wed Apr 21 20:25:56 1999 +++ php4/ext/standard/file.c Fri Apr 23 16:05:59 1999 @@ -26,10 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.7 1999/04/22 00:25:56 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: file.c,v 1.8 1999/04/23 20:05:59 zeev Exp $ */ #include "php.h" #include "php_globals.h" #include "ext/standard/flock_compat.h" Index: php4/ext/standard/filestat.c diff -u php4/ext/standard/filestat.c:1.2 php4/ext/standard/filestat.c:1.3 --- php4/ext/standard/filestat.c:1.2 Wed Apr 21 00:02:11 1999 +++ php4/ext/standard/filestat.c Fri Apr 23 16:05:59 1999 @@ -27,10 +27,8 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.2 1999/04/21 04:02:11 zeev Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: filestat.c,v 1.3 1999/04/23 20:05:59 zeev Exp $ */ + #include "php.h" #include "safe_mode.h" #include "fopen-wrappers.h" Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.3 php4/ext/standard/formatted_print.c:1.4 --- php4/ext/standard/formatted_print.c:1.3 Wed Apr 21 20:25:57 1999 +++ php4/ext/standard/formatted_print.c Fri Apr 23 16:05:59 1999 @@ -27,12 +27,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.3 1999/04/22 00:25:57 ssb Exp $ */ +/* $Id: formatted_print.c,v 1.4 1999/04/23 20:05:59 zeev Exp $ */ #include <math.h> /* modf() */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" #include "ext/standard/head.h" #include "php3_string.h" Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.3 php4/ext/standard/fsock.c:1.4 --- php4/ext/standard/fsock.c:1.3 Wed Apr 21 22:48:25 1999 +++ php4/ext/standard/fsock.c Fri Apr 23 16:05:59 1999 @@ -27,10 +27,8 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.3 1999/04/22 02:48:25 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: fsock.c,v 1.4 1999/04/23 20:05:59 zeev Exp $ */ + #include "php.h" #include <stdlib.h> #if HAVE_UNISTD_H Index: php4/ext/standard/head.c diff -u php4/ext/standard/head.c:1.1 php4/ext/standard/head.c:1.2 --- php4/ext/standard/head.c:1.1 Wed Apr 21 20:25:57 1999 +++ php4/ext/standard/head.c Fri Apr 23 16:05:59 1999 @@ -26,10 +26,8 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.1 1999/04/22 00:25:57 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: head.c,v 1.2 1999/04/23 20:05:59 zeev Exp $ */ + #include <stdio.h> #include "php.h" #include "ext/standard/php3_standard.h" Index: php4/ext/standard/html.c diff -u php4/ext/standard/html.c:1.1 php4/ext/standard/html.c:1.2 --- php4/ext/standard/html.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/html.c Fri Apr 23 16:05:59 1999 @@ -28,9 +28,6 @@ +----------------------------------------------------------------------+ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" #include "reg.h" #include "html.h" Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.4 php4/ext/standard/info.c:1.5 --- php4/ext/standard/info.c:1.4 Wed Apr 21 20:25:57 1999 +++ php4/ext/standard/info.c Fri Apr 23 16:05:59 1999 @@ -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" Index: php4/ext/standard/link.c diff -u php4/ext/standard/link.c:1.2 php4/ext/standard/link.c:1.3 --- php4/ext/standard/link.c:1.2 Wed Apr 21 00:02:11 1999 +++ php4/ext/standard/link.c Fri Apr 23 16:05:59 1999 @@ -28,10 +28,8 @@ +----------------------------------------------------------------------+ */ -/* $Id: link.c,v 1.2 1999/04/21 04:02:11 zeev Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: link.c,v 1.3 1999/04/23 20:05:59 zeev Exp $ */ + #include "php.h" #include "php3_filestat.h" #include "php_globals.h" Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.1 php4/ext/standard/mail.c:1.2 --- php4/ext/standard/mail.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/mail.c Fri Apr 23 16:05:59 1999 @@ -28,14 +28,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: mail.c,v 1.2 1999/04/23 20:05:59 zeev Exp $ */ #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" Index: php4/ext/standard/math.c diff -u php4/ext/standard/math.c:1.1 php4/ext/standard/math.c:1.2 --- php4/ext/standard/math.c:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/math.c Fri Apr 23 16:05:59 1999 @@ -28,9 +28,6 @@ +----------------------------------------------------------------------+ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include "php.h" #include "phpmath.h" #include "snprintf.h" Index: php4/ext/standard/md5.c diff -u php4/ext/standard/md5.c:1.1 php4/ext/standard/md5.c:1.2 --- php4/ext/standard/md5.c:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/md5.c Fri Apr 23 16:05:59 1999 @@ -30,9 +30,6 @@ /* * md5.c - Copyright 1997 Lachlan Roche */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include <stdio.h> #include "php.h" Index: php4/ext/standard/microtime.c diff -u php4/ext/standard/microtime.c:1.1 php4/ext/standard/microtime.c:1.2 --- php4/ext/standard/microtime.c:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/microtime.c Fri Apr 23 16:05:59 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.c,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ +/* $Id: microtime.c,v 1.2 1999/04/23 20:05:59 zeev Exp $ */ #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -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" Index: php4/ext/standard/mime.c diff -u php4/ext/standard/mime.c:1.1 php4/ext/standard/mime.c:1.2 --- php4/ext/standard/mime.c:1.1 Wed Apr 21 22:48:25 1999 +++ php4/ext/standard/mime.c Fri Apr 23 16:05:59 1999 @@ -26,10 +26,8 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: mime.c,v 1.1 1999/04/22 02:48:25 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: mime.c,v 1.2 1999/04/23 20:05:59 zeev Exp $ */ + #include <stdio.h> #include "php.h" #include "ext/standard/php3_standard.h" Index: php4/ext/standard/pack.c diff -u php4/ext/standard/pack.c:1.3 php4/ext/standard/pack.c:1.4 --- php4/ext/standard/pack.c:1.3 Wed Apr 21 20:25:57 1999 +++ php4/ext/standard/pack.c Fri Apr 23 16:05:59 1999 @@ -26,10 +26,8 @@ | Authors: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.3 1999/04/22 00:25:57 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: pack.c,v 1.4 1999/04/23 20:05:59 zeev Exp $ */ + #include "php.h" #include <stdio.h> Index: php4/ext/standard/pageinfo.c diff -u php4/ext/standard/pageinfo.c:1.1 php4/ext/standard/pageinfo.c:1.2 --- php4/ext/standard/pageinfo.c:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/pageinfo.c Fri Apr 23 16:05:59 1999 @@ -26,10 +26,8 @@ | Authors: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: pageinfo.c,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: pageinfo.c,v 1.2 1999/04/23 20:05:59 zeev Exp $ */ + #include "php.h" #include "pageinfo.h" Index: php4/ext/standard/post.c diff -u php4/ext/standard/post.c:1.1 php4/ext/standard/post.c:1.2 --- php4/ext/standard/post.c:1.1 Wed Apr 21 22:48:25 1999 +++ php4/ext/standard/post.c Fri Apr 23 16:05:59 1999 @@ -27,9 +27,7 @@ +----------------------------------------------------------------------+ */ /* $Id: */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif + #include <stdio.h> #include "php.h" #include "php3_standard.h" Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.2 php4/ext/standard/reg.c:1.3 --- php4/ext/standard/reg.c:1.2 Wed Apr 21 13:11:01 1999 +++ php4/ext/standard/reg.c Fri Apr 23 16:05:59 1999 @@ -28,10 +28,8 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.2 1999/04/21 17:11:01 sas Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: reg.c,v 1.3 1999/04/23 20:05:59 zeev Exp $ */ + #include <stdio.h> #include "php.h" #include "php3_string.h" Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.6 php4/ext/standard/string.c:1.7 --- php4/ext/standard/string.c:1.6 Wed Apr 21 22:48:25 1999 +++ php4/ext/standard/string.c Fri Apr 23 16:06:00 1999 @@ -30,10 +30,8 @@ */ -/* $Id: string.c,v 1.6 1999/04/22 02:48:25 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: string.c,v 1.7 1999/04/23 20:06:00 zeev Exp $ */ + #include <stdio.h> #include "php.h" #include "reg.h" Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.2 php4/ext/standard/syslog.c:1.3 --- php4/ext/standard/syslog.c:1.2 Wed Apr 21 13:28:54 1999 +++ php4/ext/standard/syslog.c Fri Apr 23 16:06:00 1999 @@ -27,10 +27,8 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.2 1999/04/21 17:28:54 zeev Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: syslog.c,v 1.3 1999/04/23 20:06:00 zeev Exp $ */ + #include "php.h" #include "php_ini.h" #include "zend_globals.h" Index: php4/ext/standard/uniqid.c diff -u php4/ext/standard/uniqid.c:1.1 php4/ext/standard/uniqid.c:1.2 --- php4/ext/standard/uniqid.c:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/uniqid.c Fri Apr 23 16:06:00 1999 @@ -27,10 +27,8 @@ +----------------------------------------------------------------------+ */ -/* $Id: uniqid.c,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif +/* $Id: uniqid.c,v 1.2 1999/04/23 20:06:00 zeev Exp $ */ + #include "php.h" #include <stdlib.h> Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.1 php4/ext/standard/url.c:1.2 --- php4/ext/standard/url.c:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/url.c Fri Apr 23 16:06:00 1999 @@ -26,7 +26,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ +/* $Id: url.c,v 1.2 1999/04/23 20:06:00 zeev Exp $ */ #include <stdlib.h> #include <string.h> @@ -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" Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.3 php4/ext/standard/var.c:1.4 --- php4/ext/standard/var.c:1.3 Wed Apr 21 22:48:25 1999 +++ php4/ext/standard/var.c Fri Apr 23 16:06:00 1999 @@ -27,9 +27,6 @@ +----------------------------------------------------------------------+ */ -#ifdef THREAD_SAFE -#include "tls.h" -#endif #include <stdio.h> #include <stdlib.h> #include <errno.h> -- PHP 4 Beta