sniper Thu Nov 17 03:37:31 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/sapi/cli php_cli.c php_cli_readline.c
Log:
MFH: - Fix compile failure when ext/readline is compiled as shared (bug
#35249)
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.129.2.5&r2=1.129.2.6&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.5
php-src/sapi/cli/php_cli.c:1.129.2.6
--- php-src/sapi/cli/php_cli.c:1.129.2.5 Tue Nov 15 10:27:26 2005
+++ php-src/sapi/cli/php_cli.c Thu Nov 17 03:37:31 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.129.2.5 2005/11/15 15:27:26 iliaa Exp $ */
+/* $Id: php_cli.c,v 1.129.2.6 2005/11/17 08:37:31 sniper Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -70,11 +70,12 @@
#include <unixlib/local.h>
#endif
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
#include <readline/readline.h>
#if !HAVE_LIBEDIT
#include <readline/history.h>
#endif
+#include "php_cli_readline.h"
#endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
#include "zend_compile.h"
@@ -82,9 +83,7 @@
#include "zend_highlight.h"
#include "zend_indent.h"
-
#include "php_getopt.h"
-#include "php_cli_readline.h"
#ifndef O_BINARY
#define O_BINARY 0
@@ -100,7 +99,7 @@
static char *php_optarg = NULL;
static int php_optind = 1;
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
static char php_last_char = '\0';
#endif
@@ -212,7 +211,7 @@
uint remaining = str_length;
size_t ret;
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
if (!str_length) {
return 0;
}
@@ -390,7 +389,7 @@
" %s [options] -- [args...]\n"
" %s [options] -a\n"
"\n"
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
" -a Run as interactive shell\n"
#else
" -a Run interactively\n"
@@ -977,7 +976,7 @@
cli_register_file_handles(TSRMLS_C);
}
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
if (interactive) {
char *line;
size_t size = 4096, pos = 0, len;
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli_readline.c?r1=1.3.2.2&r2=1.3.2.3&ty=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.3.2.2
php-src/sapi/cli/php_cli_readline.c:1.3.2.3
--- php-src/sapi/cli/php_cli_readline.c:1.3.2.2 Mon Nov 7 14:14:40 2005
+++ php-src/sapi/cli/php_cli_readline.c Thu Nov 17 03:37:31 2005
@@ -17,9 +17,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli_readline.c,v 1.3.2.2 2005/11/07 19:14:40 helly Exp $ */
+/* $Id: php_cli_readline.c,v 1.3.2.3 2005/11/17 08:37:31 sniper Exp $ */
#include "php.h"
+
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
+
#include "php_globals.h"
#include "php_variables.h"
#include "zend_hash.h"
@@ -42,20 +45,16 @@
#include <unixlib/local.h>
#endif
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
#include <readline/readline.h>
#if !HAVE_LIBEDIT
#include <readline/history.h>
#endif
-#endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
#include "zend_compile.h"
#include "zend_execute.h"
#include "zend_highlight.h"
#include "zend_indent.h"
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
-
/* {{{ cli_is_valid_code
*/
typedef enum {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
