[PHP-CVS] svn: /php/php-src/trunk/ ext/readline/readline_cli.c sapi/cli/php_cli.c

[Felipe Pena]

felipe                                   Sat, 19 Feb 2011 16:32:00 +0000

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

Log:
- Fixed build

Changed paths:
    U   php/php-src/trunk/ext/readline/readline_cli.c
    U   php/php-src/trunk/sapi/cli/php_cli.c

Modified: php/php-src/trunk/ext/readline/readline_cli.c
===================================================================
--- php/php-src/trunk/ext/readline/readline_cli.c       2011-02-19 16:26:11 UTC 
(rev 308484)
+++ php/php-src/trunk/ext/readline/readline_cli.c       2011-02-19 16:32:00 UTC 
(rev 308485)
@@ -68,6 +68,10 @@
 #include <dlfcn.h>
 #endif

+#ifndef RTLD_DEFAULT
+#define RTLD_DEFAULT NULL
+#endif
+
 #define DEFAULT_PROMPT "\\b \\> "

 ZEND_DECLARE_MODULE_GLOBALS(cli_readline);

Modified: php/php-src/trunk/sapi/cli/php_cli.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli.c        2011-02-19 16:26:11 UTC (rev 
308484)
+++ php/php-src/trunk/sapi/cli/php_cli.c        2011-02-19 16:32:00 UTC (rev 
308485)
@@ -1131,7 +1131,7 @@
                        }

                        if (interactive && cli_shell_callbacks.cli_shell_run) {
-                               exit_status = 
cli_shell_callbacks.cli_shell_run();
+                               exit_status = 
cli_shell_callbacks.cli_shell_run(TSRMLS_C);
                        } else {
                                php_execute_script(&file_handle TSRMLS_CC);
                                exit_status = EG(exit_status);


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