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.

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
Changes from 1 commit
Commits
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
Remove extern
  • Loading branch information
sjinks committed Jan 12, 2014
commit bbbcfd3b40d8811b73fbf0d1f2ac0a2b35a83a6a
20 changes: 10 additions & 10 deletions ext/kernel/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,30 +48,30 @@


/* Startup functions */
extern void php_phalcon_init_globals(zend_phalcon_globals *phalcon_globals TSRMLS_DC);
extern zend_class_entry *phalcon_register_internal_interface_ex(zend_class_entry *orig_ce, zend_class_entry *parent_ce TSRMLS_DC);
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 */
extern int phalcon_init_global(char *global, unsigned int global_length TSRMLS_DC);
extern int phalcon_get_global(zval **arr, const char *global, unsigned int global_length TSRMLS_DC);
int phalcon_init_global(char *global, unsigned int global_length TSRMLS_DC);
int phalcon_get_global(zval **arr, const char *global, unsigned int global_length TSRMLS_DC);

extern int phalcon_is_callable(zval *var TSRMLS_DC);
extern int phalcon_function_exists(const zval *function_name TSRMLS_DC);
extern int phalcon_function_exists_ex(const char *func_name, unsigned int func_len TSRMLS_DC);
extern int phalcon_function_quick_exists_ex(const char *func_name, unsigned int func_len, unsigned long key TSRMLS_DC);
int phalcon_is_callable(zval *var TSRMLS_DC);
int phalcon_function_exists(const zval *function_name TSRMLS_DC);
int phalcon_function_exists_ex(const char *func_name, unsigned int func_len TSRMLS_DC);
int phalcon_function_quick_exists_ex(const char *func_name, unsigned int func_len, unsigned long key TSRMLS_DC);

/* Count */
long int phalcon_fast_count_int(zval *value TSRMLS_DC);
void phalcon_fast_count(zval *result, zval *array TSRMLS_DC);
int phalcon_fast_count_ev(zval *array TSRMLS_DC);

/* Utils functions */
extern int phalcon_is_iterable_ex(zval *arr, HashTable **arr_hash, HashPosition *hash_position, int duplicate, int reverse);
int phalcon_is_iterable_ex(zval *arr, HashTable **arr_hash, HashPosition *hash_position, int duplicate, int reverse);
void phalcon_safe_zval_ptr_dtor(zval *pzval);


/* Fetch Parameters */
extern int phalcon_fetch_parameters(int num_args TSRMLS_DC, int required_args, int optional_args, ...);
int phalcon_fetch_parameters(int num_args TSRMLS_DC, int required_args, int optional_args, ...);
int phalcon_fetch_parameters_ex(int dummy TSRMLS_DC, int n_req, int n_opt, ...);

/* Compatibility macros for PHP 5.3 */
Expand Down