Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return Value Optimization - PHP 5.5 #1047

Merged
merged 1 commit into from Aug 10, 2013
+6 −1
Merged

Return Value Optimization - PHP 5.5 #1047

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ext/phalcon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,12 @@ zend_class_entry *phalcon_image_adapter_imagick_ce;

ZEND_DECLARE_MODULE_GLOBALS(phalcon)

#if PHP_VERSION_ID >= 50500
static void (*orig_execute_internal)(zend_execute_data *, zend_fcall_info *, int TSRMLS_DC) = NULL;
#else
static void (*orig_execute_internal)(zend_execute_data *, int TSRMLS_DC) = NULL;
#endif

static void (*old_error_cb)(int, const char *, const uint, const char *, va_list) = NULL;

static void phalcon_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args)
Expand Down Expand Up @@ -682,8 +687,8 @@ static PHP_MINIT_FUNCTION(phalcon){
PHALCON_INIT(Phalcon_Mvc_Controller);
PHALCON_INIT(Phalcon_Mvc_Collection_Exception);
PHALCON_INIT(Phalcon_Mvc_Collection_Document);
PHALCON_INIT(Phalcon_Mvc_Collection_Manager);
PHALCON_INIT(Phalcon_Mvc_Collection_ManagerInterface);
PHALCON_INIT(Phalcon_Mvc_Collection_Manager);
PHALCON_INIT(Phalcon_Mvc_ControllerInterface);
PHALCON_INIT(Phalcon_Mvc_Dispatcher);
PHALCON_INIT(Phalcon_Mvc_Dispatcher_Exception);
Expand Down