cvs: /php4/ext/ftp php_ftp.c /php4/ext/readline php_readline.h readline.c
| From: | Thies C. Arntzen | Date: | Wed, 08 Dec 1999 11:48:41 +0000 |
| Subject: | cvs: /php4/ext/ftp php_ftp.c /php4/ext/readline php_readline.h readline.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7664@lists.php.net to get a copy of this message | ||
thies Wed Dec 8 06:48:41 1999 EDT
Modified files:
/php4/ext/ftp php_ftp.c
/php4/ext/readline php_readline.h readline.c
Log:
ZTS compile fixes
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.8 php4/ext/ftp/php_ftp.c:1.9
--- php4/ext/ftp/php_ftp.c:1.8 Fri Oct 15 11:22:20 1999
+++ php4/ext/ftp/php_ftp.c Wed Dec 8 06:48:10 1999
@@ -28,7 +28,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.8 1999/10/15 15:22:20 thies Exp $ */
+/* $Id: php_ftp.c,v 1.9 1999/12/08 11:48:10 thies Exp $ */
#include "php.h"
@@ -96,6 +96,9 @@
PHP_MINIT_FUNCTION(ftp)
#endif
{
+
+ ELS_FETCH();
+
le_ftpbuf = register_list_destructors(ftp_destructor_ftpbuf, NULL);
REGISTER_MAIN_LONG_CONSTANT("FTP_ASCII", FTPTYPE_ASCII,
CONST_PERSISTENT | CONST_CS);
Index: php4/ext/readline/php_readline.h
diff -u php4/ext/readline/php_readline.h:1.2 php4/ext/readline/php_readline.h:1.3
--- php4/ext/readline/php_readline.h:1.2 Thu Oct 14 12:53:51 1999
+++ php4/ext/readline/php_readline.h Wed Dec 8 06:48:10 1999
@@ -16,14 +16,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_readline.h,v 1.2 1999/10/14 16:53:51 thies Exp $ */
+/* $Id: php_readline.h,v 1.3 1999/12/08 11:48:10 thies Exp $ */
#ifndef _PHP_READLINE_H
#define _PHP_READLINE_H
#if HAVE_LIBREADLINE
#ifdef ZTS
-#error Readline module will *NEVER* be thread-safe
+#warning Readline module will *NEVER* be thread-safe
#endif
#ifndef CGI_BINARY
Index: php4/ext/readline/readline.c
diff -u php4/ext/readline/readline.c:1.4 php4/ext/readline/readline.c:1.5
--- php4/ext/readline/readline.c:1.4 Mon Oct 25 04:23:54 1999
+++ php4/ext/readline/readline.c Wed Dec 8 06:48:10 1999
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: readline.c,v 1.4 1999/10/25 08:23:54 thies Exp $ */
+/* $Id: readline.c,v 1.5 1999/12/08 11:48:10 thies Exp $ */
/* {{{ includes & prototypes */
@@ -365,7 +365,7 @@
zval *params[4];
int i;
char **matches = NULL;
- ELS_FETCH();
+ CLS_FETCH();
params[0]=_readline_string_zval(_readline_completion);
params[1]=_readline_string_zval(text);