Skip to content

Commit 4b974d2

Browse files
michael-grundermichael-grunder
committed
Use win32 function prototypes for lib functions
1 parent df1811e commit 4b974d2

File tree

5 files changed

+90
-101
lines changed

5 files changed

+90
-101
lines changed

‎cluster_library.h

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -343,101 +343,101 @@ unsigned short cluster_hash_key(const char *key, int len);
343343
/* Get the current time in miliseconds */
344344
long long mstime(void);
345345

346-
PHPAPI short cluster_send_command(redisCluster *c, short slot, const char *cmd,
346+
PHP_REDIS_API short cluster_send_command(redisCluster *c, short slot, const char *cmd,
347347
int cmd_len TSRMLS_DC);
348348

349-
PHPAPI void cluster_disconnect(redisCluster *c TSRMLS_DC);
349+
PHP_REDIS_API void cluster_disconnect(redisCluster *c TSRMLS_DC);
350350

351-
PHPAPI int cluster_send_exec(redisCluster *c, short slot TSRMLS_DC);
352-
PHPAPI int cluster_send_discard(redisCluster *c, short slot TSRMLS_DC);
353-
PHPAPI int cluster_abort_exec(redisCluster *c TSRMLS_DC);
354-
PHPAPI int cluster_reset_multi(redisCluster *c);
351+
PHP_REDIS_API int cluster_send_exec(redisCluster *c, short slot TSRMLS_DC);
352+
PHP_REDIS_API int cluster_send_discard(redisCluster *c, short slot TSRMLS_DC);
353+
PHP_REDIS_API int cluster_abort_exec(redisCluster *c TSRMLS_DC);
354+
PHP_REDIS_API int cluster_reset_multi(redisCluster *c);
355355

356-
PHPAPI short cluster_find_slot(redisCluster *c, const char *host,
356+
PHP_REDIS_API short cluster_find_slot(redisCluster *c, const char *host,
357357
unsigned short port);
358-
PHPAPI int cluster_send_slot(redisCluster *c, short slot, char *cmd,
358+
PHP_REDIS_API int cluster_send_slot(redisCluster *c, short slot, char *cmd,
359359
int cmd_len, REDIS_REPLY_TYPE rtype TSRMLS_DC);
360360

361-
PHPAPI int cluster_init_seeds(redisCluster *c, HashTable *ht_seeds);
362-
PHPAPI int cluster_map_keyspace(redisCluster *c TSRMLS_DC);
363-
PHPAPI void cluster_free_node(redisClusterNode *node);
361+
PHP_REDIS_API int cluster_init_seeds(redisCluster *c, HashTable *ht_seeds);
362+
PHP_REDIS_API int cluster_map_keyspace(redisCluster *c TSRMLS_DC);
363+
PHP_REDIS_API void cluster_free_node(redisClusterNode *node);
364364

365-
PHPAPI char **cluster_sock_read_multibulk_reply(RedisSock *redis_sock,
365+
PHP_REDIS_API char **cluster_sock_read_multibulk_reply(RedisSock *redis_sock,
366366
int *len TSRMLS_DC);
367367

368368
/*
369369
* Redis Cluster response handlers. Our response handlers generally take the
370370
* following form:
371-
* PHPAPI void handler(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
371+
* PHP_REDIS_API void handler(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
372372
* void *ctx)
373373
*
374374
* Reply handlers are responsible for setting the PHP return value (either to
375375
* something valid, or FALSE in the case of some failures).
376376
*/
377377

378-
PHPAPI void cluster_bool_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
378+
PHP_REDIS_API void cluster_bool_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
379379
void *ctx);
380-
PHPAPI void cluster_ping_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
380+
PHP_REDIS_API void cluster_ping_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
381381
void *ctx);
382-
PHPAPI void cluster_bulk_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
382+
PHP_REDIS_API void cluster_bulk_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
383383
void *ctx);
384-
PHPAPI void cluster_bulk_raw_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
384+
PHP_REDIS_API void cluster_bulk_raw_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
385385
void *ctx);
386-
PHPAPI void cluster_dbl_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
386+
PHP_REDIS_API void cluster_dbl_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
387387
void *ctx);
388-
PHPAPI void cluster_1_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
388+
PHP_REDIS_API void cluster_1_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
389389
void *ctx);
390-
PHPAPI void cluster_long_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
390+
PHP_REDIS_API void cluster_long_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
391391
void *ctx);
392-
PHPAPI void cluster_type_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
392+
PHP_REDIS_API void cluster_type_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
393393
void *ctx);
394-
PHPAPI void cluster_sub_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
394+
PHP_REDIS_API void cluster_sub_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
395395
void *ctx);
396-
PHPAPI void cluster_unsub_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
396+
PHP_REDIS_API void cluster_unsub_resp(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
397397
void *ctx);
398398

399399
/* Generic/Variant handler for stuff like EVAL */
400-
PHPAPI void cluster_variant_resp(INTERNAL_FUNCTION_PARAMETERS,
400+
PHP_REDIS_API void cluster_variant_resp(INTERNAL_FUNCTION_PARAMETERS,
401401
redisCluster *c, void *ctx);
402402

403403
/* MULTI BULK response functions */
404-
PHPAPI void cluster_gen_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
404+
PHP_REDIS_API void cluster_gen_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
405405
redisCluster *c, mbulk_cb func, void *ctx);
406-
PHPAPI void cluster_mbulk_raw_resp(INTERNAL_FUNCTION_PARAMETERS,
406+
PHP_REDIS_API void cluster_mbulk_raw_resp(INTERNAL_FUNCTION_PARAMETERS,
407407
redisCluster *c, void *ctx);
408-
PHPAPI void cluster_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
408+
PHP_REDIS_API void cluster_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
409409
redisCluster *c, void *ctx);
410-
PHPAPI void cluster_mbulk_zipstr_resp(INTERNAL_FUNCTION_PARAMETERS,
410+
PHP_REDIS_API void cluster_mbulk_zipstr_resp(INTERNAL_FUNCTION_PARAMETERS,
411411
redisCluster *c, void *ctx);
412-
PHPAPI void cluster_mbulk_zipdbl_resp(INTERNAL_FUNCTION_PARAMETERS,
412+
PHP_REDIS_API void cluster_mbulk_zipdbl_resp(INTERNAL_FUNCTION_PARAMETERS,
413413
redisCluster *c, void *ctx);
414-
PHPAPI void cluster_mbulk_assoc_resp(INTERNAL_FUNCTION_PARAMETERS,
414+
PHP_REDIS_API void cluster_mbulk_assoc_resp(INTERNAL_FUNCTION_PARAMETERS,
415415
redisCluster *c, void *ctx);
416-
PHPAPI void cluster_multi_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
416+
PHP_REDIS_API void cluster_multi_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
417417
redisCluster *c, void *ctx);
418-
PHPAPI zval *cluster_zval_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
418+
PHP_REDIS_API zval *cluster_zval_mbulk_resp(INTERNAL_FUNCTION_PARAMETERS,
419419
redisCluster *c, int pull, mbulk_cb cb);
420420

421421
/* Handlers for things like DEL/MGET/MSET/MSETNX */
422-
PHPAPI void cluster_del_resp(INTERNAL_FUNCTION_PARAMETERS,
422+
PHP_REDIS_API void cluster_del_resp(INTERNAL_FUNCTION_PARAMETERS,
423423
redisCluster *c, void *ctx);
424-
PHPAPI void cluster_mbulk_mget_resp(INTERNAL_FUNCTION_PARAMETERS,
424+
PHP_REDIS_API void cluster_mbulk_mget_resp(INTERNAL_FUNCTION_PARAMETERS,
425425
redisCluster *c, void *ctx);
426-
PHPAPI void cluster_mset_resp(INTERNAL_FUNCTION_PARAMETERS,
426+
PHP_REDIS_API void cluster_mset_resp(INTERNAL_FUNCTION_PARAMETERS,
427427
redisCluster *c, void *ctx);
428-
PHPAPI void cluster_msetnx_resp(INTERNAL_FUNCTION_PARAMETERS,
428+
PHP_REDIS_API void cluster_msetnx_resp(INTERNAL_FUNCTION_PARAMETERS,
429429
redisCluster *c, void *ctx);
430430

431431
/* Response handler for ZSCAN, SSCAN, and HSCAN */
432-
PHPAPI int cluster_scan_resp(INTERNAL_FUNCTION_PARAMETERS,
432+
PHP_REDIS_API int cluster_scan_resp(INTERNAL_FUNCTION_PARAMETERS,
433433
redisCluster *c, REDIS_SCAN_TYPE type, long *it);
434434

435435
/* INFO response handler */
436-
PHPAPI void cluster_info_resp(INTERNAL_FUNCTION_PARAMETERS,
436+
PHP_REDIS_API void cluster_info_resp(INTERNAL_FUNCTION_PARAMETERS,
437437
redisCluster *c, void *ctx);
438438

439439
/* CLIENT LIST response handler */
440-
PHPAPI void cluster_client_list_resp(INTERNAL_FUNCTION_PARAMETERS,
440+
PHP_REDIS_API void cluster_client_list_resp(INTERNAL_FUNCTION_PARAMETERS,
441441
redisCluster *c, void *ctx);
442442

443443
/* MULTI BULK processing callbacks */

‎common.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
#define REDIS_ZSET 4
2929
#define REDIS_HASH 5
3030

31+
#ifdef PHP_WIN32
32+
#define PHP_REDIS_API __declspec(dllexport)
33+
#else
34+
#define PHP_REDIS_API
35+
#endif
36+
3137
/* reply types */
3238
typedef enum _REDIS_REPLY_TYPE {
3339
TYPE_EOF = -1,

‎library.h

Lines changed: 36 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -14,54 +14,29 @@ int redis_cmd_append_sstr_long(smart_str *str, long append);
1414
int redis_cmd_append_int(char **cmd, int cmd_len, int append);
1515
int redis_cmd_append_sstr_dbl(smart_str *str, double value);
1616

17-
PHP_REDIS_API char* redis_sock_read(RedisSock *redis_sock, int *buf_len TSRMLS_DC);
17+
PHP_REDIS_API char * redis_sock_read(RedisSock *redis_sock, int *buf_len TSRMLS_DC);
18+
PHP_REDIS_API int redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t* line_len TSRMLS_DC);
1819
PHP_REDIS_API void redis_1_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
1920
PHP_REDIS_API void redis_long_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval* z_tab, void *ctx);
20-
PHP_REDIS_API char* redis_sock_read(RedisSock *redis_sock, int *buf_len TSRMLS_DC);
21-
PHP_REDIS_API int redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t* line_len TSRMLS_DC);
22-
2321
typedef void (*SuccessCallback)(RedisSock *redis_sock);
24-
PHPAPI void redis_boolean_response_impl(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx, SuccessCallback success_callback);
25-
PHPAPI void redis_boolean_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
26-
PHPAPI void redis_bulk_double_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
27-
PHPAPI void redis_string_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
28-
PHPAPI void redis_ping_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
29-
PHPAPI void redis_info_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
30-
PHPAPI zval *redis_parse_info_response(char *resp);
31-
PHPAPI zval *redis_parse_client_list_response(char *resp);
32-
PHPAPI void redis_type_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
33-
PHPAPI RedisSock* redis_sock_create(char *host, int host_len, unsigned short port, double timeout, int persistent, char *persistent_id, long retry_interval, zend_bool lazy_connect);
34-
PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC);
35-
PHPAPI int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRMLS_DC);
36-
PHPAPI int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC);
37-
PHPAPI zval *redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock);
38-
PHPAPI char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes TSRMLS_DC);
39-
PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *_z_tab, void *ctx);
40-
PHPAPI void redis_mbulk_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, int count, int unserialize);
41-
42-
PHPAPI int redis_mbulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
43-
PHPAPI int redis_mbulk_reply_zipped_raw(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
44-
PHPAPI int redis_mbulk_reply_zipped_vals(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
45-
PHPAPI int redis_mbulk_reply_zipped_keys_int(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
46-
PHPAPI int redis_mbulk_reply_zipped_keys_dbl(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
47-
PHPAPI int redis_mbulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
48-
49-
PHPAPI int redis_sock_read_scan_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, REDIS_SCAN_TYPE type, long *iter);
50-
51-
PHPAPI int redis_subscribe_response(INTERNAL_FUNCTION_PARAMETERS,
52-
RedisSock *redis_sock, zval *z_tab, void *ctx);
53-
PHPAPI int redis_unsubscribe_response(INTERNAL_FUNCTION_PARAMETERS,
54-
RedisSock *redis_sock, zval *z_tab, void *ctx);
55-
56-
PHPAPI int redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz TSRMLS_DC);
57-
PHPAPI void redis_stream_close(RedisSock *redis_sock TSRMLS_DC);
58-
PHPAPI int redis_check_eof(RedisSock *redis_sock, int no_throw TSRMLS_DC);
59-
PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC, int nothrow);
60-
PHPAPI void redis_free_socket(RedisSock *redis_sock);
61-
PHPAPI void redis_send_discard(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock);
62-
PHPAPI int redis_sock_set_err(RedisSock *redis_sock, const char *msg, int msg_len);
63-
22+
PHP_REDIS_API void redis_boolean_response_impl(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx, SuccessCallback success_callback);
23+
PHP_REDIS_API void redis_boolean_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
24+
PHP_REDIS_API void redis_bulk_double_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
25+
PHP_REDIS_API void redis_string_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
26+
PHP_REDIS_API void redis_ping_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
27+
PHP_REDIS_API void redis_info_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
28+
PHP_REDIS_API zval *redis_parse_info_response(char *resp);
29+
PHP_REDIS_API zval *redis_parse_client_list_response(char *resp);
30+
PHP_REDIS_API void redis_type_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
31+
PHP_REDIS_API RedisSock* redis_sock_create(char *host, int host_len, unsigned short port, double timeout, int persistent, char *persistent_id, long retry_interval, zend_bool lazy_connect);
32+
PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC);
33+
PHP_REDIS_API int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRMLS_DC);
34+
PHP_REDIS_API int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC);
35+
PHP_REDIS_API zval *redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock);
36+
PHP_REDIS_API char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes TSRMLS_DC);
37+
PHP_REDIS_API int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *_z_tab, void *ctx);
6438
PHP_REDIS_API void redis_mbulk_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, int count, int unserialize);
39+
6540
PHP_REDIS_API int redis_mbulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
6641
PHP_REDIS_API int redis_mbulk_reply_zipped_raw(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
6742
PHP_REDIS_API int redis_mbulk_reply_zipped_vals(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
@@ -70,14 +45,28 @@ PHP_REDIS_API int redis_mbulk_reply_zipped_keys_dbl(INTERNAL_FUNCTION_PARAMETERS
7045
PHP_REDIS_API int redis_mbulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
7146

7247
PHP_REDIS_API int redis_sock_read_scan_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, REDIS_SCAN_TYPE type, long *iter);
48+
49+
PHP_REDIS_API int redis_subscribe_response(INTERNAL_FUNCTION_PARAMETERS,
50+
RedisSock *redis_sock, zval *z_tab, void *ctx);
51+
PHP_REDIS_API int redis_unsubscribe_response(INTERNAL_FUNCTION_PARAMETERS,
52+
RedisSock *redis_sock, zval *z_tab, void *ctx);
53+
7354
PHP_REDIS_API int redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz TSRMLS_DC);
7455
PHP_REDIS_API void redis_stream_close(RedisSock *redis_sock TSRMLS_DC);
75-
PHP_REDIS_API int redis_check_eof(RedisSock *redis_sock TSRMLS_DC);
76-
/*PHP_REDIS_API int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC);*/
56+
PHP_REDIS_API int redis_check_eof(RedisSock *redis_sock, int no_throw TSRMLS_DC);
57+
PHP_REDIS_API int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC, int nothrow);
7758
PHP_REDIS_API void redis_free_socket(RedisSock *redis_sock);
7859
PHP_REDIS_API void redis_send_discard(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock);
7960
PHP_REDIS_API int redis_sock_set_err(RedisSock *redis_sock, const char *msg, int msg_len);
8061

62+
PHP_REDIS_API int
63+
redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_DC);
64+
PHP_REDIS_API int
65+
redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len);
66+
67+
PHP_REDIS_API int
68+
redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **return_value TSRMLS_DC);
69+
8170
PHP_REDIS_API int redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz TSRMLS_DC);
8271
PHP_REDIS_API void redis_stream_close(RedisSock *redis_sock TSRMLS_DC);
8372
PHP_REDIS_API int redis_check_eof(RedisSock *redis_sock TSRMLS_DC);
@@ -99,7 +88,7 @@ PHP_REDIS_API int redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE
9988
PHP_REDIS_API int redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval **z_ret TSRMLS_DC);
10089
PHP_REDIS_API int redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret TSRMLS_DC);
10190
PHP_REDIS_API int redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret TSRMLS_DC);
102-
PHP_REDIS_API int redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab);
91+
PHP_REDIS_API int redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
10392

10493
PHP_REDIS_API void redis_client_list_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab);
10594

‎php_redis.h

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,6 @@ PHP_METHOD(Redis, getAuth);
222222
PHP_METHOD(Redis, getMode);
223223
PHP_METHOD(Redis, rawcommand);
224224

225-
#ifdef PHP_WIN32
226-
#define PHP_REDIS_API __declspec(dllexport)
227-
#else
228-
#define PHP_REDIS_API
229-
#endif
230-
231225
#ifdef ZTS
232226
#include "TSRM.h"
233227
#endif
@@ -242,23 +236,23 @@ PHP_MINFO_FUNCTION(redis);
242236
typedef void (*ResultCallback)(INTERNAL_FUNCTION_PARAMETERS,
243237
RedisSock *redis_sock, zval *z_tab, void *ctx);
244238

245-
PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
239+
PHP_REDIS_API int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
246240

247-
PHPAPI void generic_sort_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sort,
241+
PHP_REDIS_API void generic_sort_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sort,
248242
int use_alpha);
249243

250-
PHPAPI void generic_subscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sub_cmd);
244+
PHP_REDIS_API void generic_subscribe_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sub_cmd);
251245

252-
PHPAPI void generic_unsubscribe_cmd(INTERNAL_FUNCTION_PARAMETERS,
246+
PHP_REDIS_API void generic_unsubscribe_cmd(INTERNAL_FUNCTION_PARAMETERS,
253247
char *unsub_cmd);
254248

255-
PHPAPI int redis_response_enqueued(RedisSock *redis_sock TSRMLS_DC);
249+
PHP_REDIS_API int redis_response_enqueued(RedisSock *redis_sock TSRMLS_DC);
256250

257-
PHPAPI int get_flag(zval *object TSRMLS_DC);
251+
PHP_REDIS_API int get_flag(zval *object TSRMLS_DC);
258252

259-
PHPAPI void set_flag(zval *object, int new_flag TSRMLS_DC);
253+
PHP_REDIS_API void set_flag(zval *object, int new_flag TSRMLS_DC);
260254

261-
PHPAPI int redis_sock_read_multibulk_multi_reply_loop(
255+
PHP_REDIS_API int redis_sock_read_multibulk_multi_reply_loop(
262256
INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab,
263257
int numElems);
264258

‎redis_cluster.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
resp_func(INTERNAL_FUNCTION_PARAM_PASSTHRU, c, ctx);
100100

101101
/* For the creation of RedisCluster specific exceptions */
102-
PHPAPI zend_class_entry *rediscluster_get_exception_base(int root TSRMLS_DC);
102+
PHP_REDIS_API zend_class_entry *rediscluster_get_exception_base(int root TSRMLS_DC);
103103

104104
/* Create cluster context */
105105
zend_object_value create_cluster_context(zend_class_entry *class_type

0 commit comments

Comments
 (0)