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

Remove duplicate macros #1794

Merged
merged 7 commits into from Jan 13, 2014
Merged

Remove duplicate macros #1794

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3dcda02
PHALCON_GET_FOREACH_VALUE => PHALCON_GET_HVALUE
sjinks Jan 12, 2014
36cdf50
PHALCON_GET_FOREACH_KEY => PHALCON_GET_HKEY
sjinks Jan 12, 2014
bbbcfd3
Remove extern
sjinks Jan 12, 2014
8a8359b
Updated CHANGELOG
sjinks Jan 12, 2014
ae1d1ed
Cleanup macros
sjinks Jan 12, 2014
5af8040
Merge remote-tracking branch 'upstream/1.3.0' into 1.3.0
sjinks Jan 13, 2014
1ddf9a0
Merge remote-tracking branch 'upstream/1.3.0' into 1.3.0
sjinks Jan 13, 2014
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/1.3.0' into 1.3.0 
Conflicts:
	ext/kernel/main.h
  • Loading branch information
@sjinks
sjinks committed Jan 13, 2014
commit 5af8040b7682057965aa6e75fa537f7e94a8daa7
3 changes: 1 addition & 2 deletions ext/kernel/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void php_phalcon_init_globals(zend_phalcon_globals *phalcon_globals TSRMLS_DC);
zend_class_entry *phalcon_register_internal_interface_ex(zend_class_entry *orig_ce, zend_class_entry *parent_ce TSRMLS_DC);

/* Globals functions */
int phalcon_get_global(zval **arr, const char *global, unsigned int global_length TSRMLS_DC);
zval* phalcon_get_global(const char *global, unsigned int global_length TSRMLS_DC);

int phalcon_is_callable(zval *var TSRMLS_DC);
int phalcon_function_quick_exists_ex(const char *func_name, unsigned int func_len, unsigned long key TSRMLS_DC);
Expand All @@ -76,7 +76,6 @@ PHALCON_ATTR_NONNULL static inline int phalcon_function_exists_ex(const char *fu
return phalcon_function_quick_exists_ex(function_name, function_len, zend_hash_func(function_name, function_len) TSRMLS_CC);
}


/* Count */
long int phalcon_fast_count_int(zval *value TSRMLS_DC);
void phalcon_fast_count(zval *result, zval *array TSRMLS_DC);
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.