diff options
author | vostok4 <vostok4@gmail.com> | 2013-10-10 15:07:01 +0400 |
---|---|---|
committer | vostok4 <vostok4@gmail.com> | 2013-10-10 15:07:01 +0400 |
commit | b7e8b3b64edbfc6583f551a22c9d2186625e19c9 (patch) | |
tree | 07d892462a28321d69faff881182cf2604b31d19 /php_redis.h | |
parent | 00233a3f91fe4fb8355977bf81070fe8fc92f77b (diff) |
Fix compilation errors on Win32 with VC11
This brings the W32 compilation fixes done by @char101 up to date and
allows building of php_redis.dll with VC11 on Win32 (allows for a php5.5
version).
Diffstat (limited to 'php_redis.h')
-rw-r--r-- | php_redis.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/php_redis.h b/php_redis.h index 879503aa..905c7b3b 100644 --- a/php_redis.h +++ b/php_redis.h @@ -209,32 +209,32 @@ PHP_RINIT_FUNCTION(redis); PHP_RSHUTDOWN_FUNCTION(redis); PHP_MINFO_FUNCTION(redis); -PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent); -PHPAPI void redis_atomic_increment(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int count); -PHPAPI int generic_multiple_args_cmd(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_len, +PHP_REDIS_API int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent); +PHP_REDIS_API void redis_atomic_increment(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int count); +PHP_REDIS_API int generic_multiple_args_cmd(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_len, int min_argc, RedisSock **redis_sock, int has_timeout, int all_keys, int can_serialize); -PHPAPI void generic_sort_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sort, int use_alpha); +PHP_REDIS_API void generic_sort_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sort, int use_alpha); typedef void (*ResultCallback)(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx); -PHPAPI void generic_empty_cmd_impl(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int cmd_len, ResultCallback result_callback); -PHPAPI void generic_empty_cmd(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int cmd_len, ...); -PHPAPI void generic_empty_long_cmd(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int cmd_len, ...); +PHP_REDIS_API void generic_empty_cmd_impl(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int cmd_len, ResultCallback result_callback); +PHP_REDIS_API void generic_empty_cmd(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int cmd_len, ...); +PHP_REDIS_API void generic_empty_long_cmd(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int cmd_len, ...); -PHPAPI void generic_subscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sub_cmd); -PHPAPI void generic_unsubscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *unsub_cmd); +PHP_REDIS_API void generic_subscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sub_cmd); +PHP_REDIS_API void generic_unsubscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *unsub_cmd); -PHPAPI void array_zip_values_and_scores(RedisSock *redis_sock, zval *z_tab, int use_atof TSRMLS_DC); -PHPAPI int redis_response_enqueued(RedisSock *redis_sock TSRMLS_DC); +PHP_REDIS_API void array_zip_values_and_scores(RedisSock *redis_sock, zval *z_tab, int use_atof TSRMLS_DC); +PHP_REDIS_API int redis_response_enqueued(RedisSock *redis_sock TSRMLS_DC); -PHPAPI int get_flag(zval *object TSRMLS_DC); -PHPAPI void set_flag(zval *object, int new_flag TSRMLS_DC); +PHP_REDIS_API int get_flag(zval *object TSRMLS_DC); +PHP_REDIS_API void set_flag(zval *object, int new_flag TSRMLS_DC); -PHPAPI int redis_sock_read_multibulk_multi_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, int numElems); +PHP_REDIS_API int redis_sock_read_multibulk_multi_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, int numElems); /* pipeline */ -PHPAPI request_item* get_pipeline_head(zval *object); -PHPAPI void set_pipeline_head(zval *object, request_item *head); -PHPAPI request_item* get_pipeline_current(zval *object); -PHPAPI void set_pipeline_current(zval *object, request_item *current); +PHP_REDIS_API request_item* get_pipeline_head(zval *object); +PHP_REDIS_API void set_pipeline_head(zval *object, request_item *head); +PHP_REDIS_API request_item* get_pipeline_current(zval *object); +PHP_REDIS_API void set_pipeline_current(zval *object, request_item *current); #ifndef _MSC_VER ZEND_BEGIN_MODULE_GLOBALS(redis) |