[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/readline/readline_cli.c trunk/ext/readline/readline_cli.c

2011-09-06 Thread Hannes Magnusson 
bjoriTue, 06 Sep 2011 15:09:15 +

Revision: http://svn.php.net/viewvc?view=revision&revision=316266

Log:
Add a constant, READLINE_LIB, to be able to differenciate which lib is being 
used

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c
U   php/php-src/trunk/ext/readline/readline_cli.c

Modified: php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c
===
--- php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c2011-09-06 
15:07:24 UTC (rev 316265)
+++ php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c2011-09-06 
15:09:15 UTC (rev 316266)
@@ -715,6 +715,12 @@
ZEND_INIT_MODULE_GLOBALS(cli_readline, cli_readline_init_globals, NULL);
REGISTER_INI_ENTRIES();

+#if HAVE_LIBEDIT
+   REGISTER_STRING_CONSTANT("READLINE_LIB", "libedit", 
CONST_CS|CONST_PERSISTENT);
+#else
+   REGISTER_STRING_CONSTANT("READLINE_LIB", "readline", 
CONST_CS|CONST_PERSISTENT);
+#endif
+
GET_SHELL_CB(cb);
if (cb) {
cb->cli_shell_write = readline_shell_write;

Modified: php/php-src/trunk/ext/readline/readline_cli.c
===
--- php/php-src/trunk/ext/readline/readline_cli.c   2011-09-06 15:07:24 UTC 
(rev 316265)
+++ php/php-src/trunk/ext/readline/readline_cli.c   2011-09-06 15:09:15 UTC 
(rev 316266)
@@ -715,6 +715,12 @@
ZEND_INIT_MODULE_GLOBALS(cli_readline, cli_readline_init_globals, NULL);
REGISTER_INI_ENTRIES();

+#if HAVE_LIBEDIT
+   REGISTER_STRING_CONSTANT("READLINE_LIB", "libedit", 
CONST_CS|CONST_PERSISTENT);
+#else
+   REGISTER_STRING_CONSTANT("READLINE_LIB", "readline", 
CONST_CS|CONST_PERSISTENT);
+#endif
+
GET_SHELL_CB(cb);
if (cb) {
cb->cli_shell_write = readline_shell_write;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/readline/readline_cli.c trunk/ext/readline/readline_cli.c

2011-09-06 Thread Hannes Magnusson 
bjoriTue, 06 Sep 2011 11:28:34 +

Revision: http://svn.php.net/viewvc?view=revision&revision=316247

Log:
Mention which library php is using

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c
U   php/php-src/trunk/ext/readline/readline_cli.c

Modified: php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c
===
--- php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c2011-09-06 
11:24:21 UTC (rev 316246)
+++ php/php-src/branches/PHP_5_4/ext/readline/readline_cli.c2011-09-06 
11:28:34 UTC (rev 316247)
@@ -743,6 +743,11 @@

 PHP_MINFO_FUNCTION(cli_readline)
 {
+   php_info_print_table_start();
+   php_info_print_table_header(2, "Readline Support", "enabled");
+   php_info_print_table_row(2, "Readline library", (rl_library_version ? 
rl_library_version : "Unknown"));
+   php_info_print_table_end();
+
DISPLAY_INI_ENTRIES();
 }


Modified: php/php-src/trunk/ext/readline/readline_cli.c
===
--- php/php-src/trunk/ext/readline/readline_cli.c   2011-09-06 11:24:21 UTC 
(rev 316246)
+++ php/php-src/trunk/ext/readline/readline_cli.c   2011-09-06 11:28:34 UTC 
(rev 316247)
@@ -743,6 +743,11 @@

 PHP_MINFO_FUNCTION(cli_readline)
 {
+   php_info_print_table_start();
+   php_info_print_table_header(2, "Readline Support", "enabled");
+   php_info_print_table_row(2, "Readline library", (rl_library_version ? 
rl_library_version : "Unknown"));
+   php_info_print_table_end();
+
DISPLAY_INI_ENTRIES();
 }


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php