summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThies C. Arntzen <thies@php.net>1999-12-08 11:48:10 +0000
committerThies C. Arntzen <thies@php.net>1999-12-08 11:48:10 +0000
commit19023f3a051833694d18a034f38294660da7e62e (patch)
treef8474906ee81329f86366c904e5c1d98ce16b898
parent5fad6deb652d8d56ecff421d806f53b9b7152ae6 (diff)
downloadphp-git-19023f3a051833694d18a034f38294660da7e62e.tar.gz
ZTS compile fixes
-rw-r--r--ext/ftp/php_ftp.c3
-rw-r--r--ext/readline/php_readline.h2
-rw-r--r--ext/readline/readline.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index e8b34c60c4..c303dbcae1 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -96,6 +96,9 @@ int php3_minit_ftp(INIT_FUNC_ARGS)
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);
diff --git a/ext/readline/php_readline.h b/ext/readline/php_readline.h
index 72ca7187d0..548de29a7a 100644
--- a/ext/readline/php_readline.h
+++ b/ext/readline/php_readline.h
@@ -23,7 +23,7 @@
#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
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index ef7d521ff8..9614a2c843 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -365,7 +365,7 @@ static char **_readline_completion_cb(char *text, int start, int end)
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);