Skip to content

Commit fc0d10b

Browse files
char101char101
committed
Fix compilation for VC9
1 parent 3df713b commit fc0d10b

File tree

9 files changed

+210
-203
lines changed

9 files changed

+210
-203
lines changed

‎library.c

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ extern zend_class_entry *redis_ce;
2525
extern zend_class_entry *redis_exception_ce;
2626
extern zend_class_entry *spl_ce_RuntimeException;
2727

28-
PHPAPI void redis_stream_close(RedisSock *redis_sock TSRMLS_DC) {
28+
PHP_REDIS_API void redis_stream_close(RedisSock *redis_sock TSRMLS_DC) {
2929
if (!redis_sock->persistent) {
3030
php_stream_close(redis_sock->stream);
3131
} else {
3232
php_stream_pclose(redis_sock->stream);
3333
}
3434
}
3535

36-
PHPAPI int redis_check_eof(RedisSock *redis_sock TSRMLS_DC)
36+
PHP_REDIS_API int redis_check_eof(RedisSock *redis_sock TSRMLS_DC)
3737
{
3838
int eof;
3939
int count = 0;
@@ -93,7 +93,7 @@ PHPAPI int redis_check_eof(RedisSock *redis_sock TSRMLS_DC)
9393
return 0;
9494
}
9595

96-
PHPAPI zval *redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock) {
96+
PHP_REDIS_API zval *redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock) {
9797
char inbuf[1024];
9898
int numElems;
9999
zval *z_tab;
@@ -128,7 +128,7 @@ PHPAPI zval *redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS,
128128
/**
129129
* redis_sock_read_bulk_reply
130130
*/
131-
PHPAPI char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes TSRMLS_DC)
131+
PHP_REDIS_API char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes TSRMLS_DC)
132132
{
133133
int offset = 0;
134134
size_t got;
@@ -144,7 +144,7 @@ PHPAPI char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes TSRMLS_
144144
} else {
145145
char c;
146146
int i;
147-
147+
148148
reply = emalloc(bytes+1);
149149

150150
while(offset < bytes) {
@@ -168,7 +168,7 @@ PHPAPI char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes TSRMLS_
168168
/**
169169
* redis_sock_read
170170
*/
171-
PHPAPI char *redis_sock_read(RedisSock *redis_sock, int *buf_len TSRMLS_DC)
171+
PHP_REDIS_API char *redis_sock_read(RedisSock *redis_sock, int *buf_len TSRMLS_DC)
172172
{
173173
char inbuf[1024];
174174
char *resp = NULL;
@@ -454,7 +454,7 @@ int redis_cmd_append_int(char **cmd, int cmd_len, int append) {
454454
return redis_cmd_append_str(cmd, cmd_len, int_buf, int_len);
455455
}
456456

457-
PHPAPI void redis_bulk_double_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
457+
PHP_REDIS_API void redis_bulk_double_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
458458

459459
char *response;
460460
int response_len;
@@ -478,7 +478,7 @@ PHPAPI void redis_bulk_double_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *
478478
}
479479
}
480480

481-
PHPAPI void redis_type_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
481+
PHP_REDIS_API void redis_type_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
482482
char *response;
483483
int response_len;
484484
long l;
@@ -513,7 +513,7 @@ PHPAPI void redis_type_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_s
513513
}
514514
}
515515

516-
PHPAPI void redis_info_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
516+
PHP_REDIS_API void redis_info_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
517517
char *response;
518518
int response_len;
519519
char *pos, *cur;
@@ -588,7 +588,7 @@ PHPAPI void redis_info_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_s
588588
}
589589
}
590590

591-
PHPAPI void redis_boolean_response_impl(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx, SuccessCallback success_callback) {
591+
PHP_REDIS_API void redis_boolean_response_impl(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx, SuccessCallback success_callback) {
592592

593593
char *response;
594594
int response_len;
@@ -625,11 +625,11 @@ PHPAPI void redis_boolean_response_impl(INTERNAL_FUNCTION_PARAMETERS, RedisSock
625625
}
626626
}
627627

628-
PHPAPI void redis_boolean_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
628+
PHP_REDIS_API void redis_boolean_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
629629
redis_boolean_response_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, ctx, NULL);
630630
}
631631

632-
PHPAPI void redis_long_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval * z_tab, void *ctx) {
632+
PHP_REDIS_API void redis_long_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval * z_tab, void *ctx) {
633633

634634
char *response;
635635
int response_len;
@@ -644,7 +644,7 @@ PHPAPI void redis_long_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_s
644644
}
645645

646646
if(response[0] == ':') {
647-
long long ret = atoll(response + 1);
647+
long long ret = _atoi64(response + 1);
648648
IF_MULTI_OR_PIPELINE() {
649649
if(ret > LONG_MAX) { /* overflow */
650650
add_next_index_stringl(z_tab, response+1, response_len-1, 1);
@@ -672,7 +672,7 @@ PHPAPI void redis_long_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_s
672672

673673

674674

675-
PHPAPI int redis_sock_read_multibulk_reply_zipped_with_flag(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, int flag) {
675+
PHP_REDIS_API int redis_sock_read_multibulk_reply_zipped_with_flag(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, int flag) {
676676

677677
/*
678678
int ret = redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab TSRMLS_CC);
@@ -720,16 +720,16 @@ PHPAPI int redis_sock_read_multibulk_reply_zipped_with_flag(INTERNAL_FUNCTION_PA
720720
return 0;
721721
}
722722

723-
PHPAPI int redis_sock_read_multibulk_reply_zipped(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
723+
PHP_REDIS_API int redis_sock_read_multibulk_reply_zipped(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
724724

725725
return redis_sock_read_multibulk_reply_zipped_with_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, 1);
726726
}
727727

728-
PHPAPI int redis_sock_read_multibulk_reply_zipped_strings(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
728+
PHP_REDIS_API int redis_sock_read_multibulk_reply_zipped_strings(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
729729
return redis_sock_read_multibulk_reply_zipped_with_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, z_tab, 0);
730730
}
731731

732-
PHPAPI void redis_1_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
732+
PHP_REDIS_API void redis_1_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
733733

734734
char *response;
735735
int response_len;
@@ -761,7 +761,7 @@ PHPAPI void redis_1_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock
761761
}
762762
}
763763

764-
PHPAPI void redis_string_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
764+
PHP_REDIS_API void redis_string_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
765765

766766
char *response;
767767
int response_len;
@@ -791,7 +791,7 @@ PHPAPI void redis_string_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis
791791
}
792792

793793
/* like string response, but never unserialized. */
794-
PHPAPI void redis_ping_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
794+
PHP_REDIS_API void redis_ping_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx) {
795795

796796
char *response;
797797
int response_len;
@@ -814,7 +814,7 @@ PHPAPI void redis_ping_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_s
814814
/**
815815
* redis_sock_create
816816
*/
817-
PHPAPI RedisSock* redis_sock_create(char *host, int host_len, unsigned short port,
817+
PHP_REDIS_API RedisSock* redis_sock_create(char *host, int host_len, unsigned short port,
818818
double timeout, int persistent, char *persistent_id)
819819
{
820820
RedisSock *redis_sock;
@@ -858,7 +858,7 @@ PHPAPI RedisSock* redis_sock_create(char *host, int host_len, unsigned short por
858858
/**
859859
* redis_sock_connect
860860
*/
861-
PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
861+
PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
862862
{
863863
struct timeval tv, *tv_ptr = NULL;
864864
char *host = NULL, *persistent_id = NULL, *errstr = NULL;
@@ -931,7 +931,7 @@ PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
931931
/**
932932
* redis_sock_server_open
933933
*/
934-
PHPAPI int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRMLS_DC)
934+
PHP_REDIS_API int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRMLS_DC)
935935
{
936936
int res = -1;
937937

@@ -958,7 +958,7 @@ PHPAPI int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRML
958958
/**
959959
* redis_sock_disconnect
960960
*/
961-
PHPAPI int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)
961+
PHP_REDIS_API int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)
962962
{
963963
if (redis_sock == NULL) {
964964
return 1;
@@ -983,7 +983,7 @@ PHPAPI int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)
983983
return 0;
984984
}
985985

986-
PHPAPI void redis_send_discard(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock)
986+
PHP_REDIS_API void redis_send_discard(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock)
987987
{
988988
char *cmd;
989989
int response_len, cmd_len;
@@ -1010,7 +1010,7 @@ PHPAPI void redis_send_discard(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_so
10101010
/**
10111011
* redis_sock_set_err
10121012
*/
1013-
PHPAPI int redis_sock_set_err(RedisSock *redis_sock, const char *msg, int msg_len) {
1013+
PHP_REDIS_API int redis_sock_set_err(RedisSock *redis_sock, const char *msg, int msg_len) {
10141014
// Allocate/Reallocate our last error member
10151015
if(msg != NULL && msg_len > 0) {
10161016
if(redis_sock->err == NULL) {
@@ -1041,7 +1041,7 @@ PHPAPI int redis_sock_set_err(RedisSock *redis_sock, const char *msg, int msg_le
10411041
/**
10421042
* redis_sock_read_multibulk_reply
10431043
*/
1044-
PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx)
1044+
PHP_REDIS_API int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx)
10451045
{
10461046
char inbuf[1024];
10471047
int numElems;
@@ -1083,7 +1083,7 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo
10831083
/**
10841084
* Like multibulk reply, but don't touch the values, they won't be compressed. (this is used by HKEYS).
10851085
*/
1086-
PHPAPI int redis_sock_read_multibulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx)
1086+
PHP_REDIS_API int redis_sock_read_multibulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx)
10871087
{
10881088
char inbuf[1024];
10891089
int numElems;
@@ -1122,7 +1122,7 @@ PHPAPI int redis_sock_read_multibulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, Red
11221122
return 0;
11231123
}
11241124

1125-
PHPAPI int
1125+
PHP_REDIS_API int
11261126
redis_sock_read_multibulk_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
11271127
zval *z_tab, int numElems, int unwrap_key, int unserialize_even_only)
11281128
{
@@ -1154,7 +1154,7 @@ redis_sock_read_multibulk_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *re
11541154
/**
11551155
* redis_sock_read_multibulk_reply_assoc
11561156
*/
1157-
PHPAPI int redis_sock_read_multibulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx)
1157+
PHP_REDIS_API int redis_sock_read_multibulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx)
11581158
{
11591159
char inbuf[1024], *response;
11601160
int response_len;
@@ -1216,7 +1216,7 @@ PHPAPI int redis_sock_read_multibulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, R
12161216
/**
12171217
* redis_sock_write
12181218
*/
1219-
PHPAPI int redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz TSRMLS_DC)
1219+
PHP_REDIS_API int redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz TSRMLS_DC)
12201220
{
12211221
if(redis_sock && redis_sock->status == REDIS_SOCK_STATUS_DISCONNECTED) {
12221222
zend_throw_exception(redis_exception_ce, "Connection closed", 0 TSRMLS_CC);
@@ -1231,7 +1231,7 @@ PHPAPI int redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz TSRMLS_D
12311231
/**
12321232
* redis_free_socket
12331233
*/
1234-
PHPAPI void redis_free_socket(RedisSock *redis_sock)
1234+
PHP_REDIS_API void redis_free_socket(RedisSock *redis_sock)
12351235
{
12361236
if(redis_sock->prefix) {
12371237
efree(redis_sock->prefix);
@@ -1243,7 +1243,7 @@ PHPAPI void redis_free_socket(RedisSock *redis_sock)
12431243
efree(redis_sock);
12441244
}
12451245

1246-
PHPAPI int
1246+
PHP_REDIS_API int
12471247
redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_DC) {
12481248
#if ZEND_MODULE_API_NO >= 20100000
12491249
php_serialize_data_t ht;
@@ -1319,7 +1319,7 @@ redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_
13191319
return 0;
13201320
}
13211321

1322-
PHPAPI int
1322+
PHP_REDIS_API int
13231323
redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **return_value TSRMLS_DC) {
13241324

13251325
php_unserialize_data_t var_hash;
@@ -1369,11 +1369,11 @@ redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **re
13691369
return 0;
13701370
}
13711371

1372-
PHPAPI int
1372+
PHP_REDIS_API int
13731373
redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len TSRMLS_DC) {
13741374
int ret_len;
13751375
char *ret;
1376-
1376+
13771377
if(redis_sock->prefix == NULL || redis_sock->prefix_len == 0) {
13781378
return 0;
13791379
}
@@ -1392,7 +1392,7 @@ redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len TSRMLS_DC) {
13921392
* Processing for variant reply types (think EVAL)
13931393
*/
13941394

1395-
PHPAPI int
1395+
PHP_REDIS_API int
13961396
redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t *line_size TSRMLS_DC) {
13971397
// Handle EOF
13981398
if(-1 == redis_check_eof(redis_sock TSRMLS_CC)) {
@@ -1420,7 +1420,7 @@ redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t *line_siz
14201420
return 0;
14211421
}
14221422

1423-
PHPAPI int
1423+
PHP_REDIS_API int
14241424
redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *reply_info TSRMLS_DC) {
14251425
// Make sure we haven't lost the connection, even trying to reconnect
14261426
if(-1 == redis_check_eof(redis_sock TSRMLS_CC)) {
@@ -1454,7 +1454,7 @@ redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *
14541454
/*
14551455
* Read a single line response, having already consumed the reply-type byte
14561456
*/
1457-
PHPAPI int
1457+
PHP_REDIS_API int
14581458
redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval **z_ret TSRMLS_DC) {
14591459
// Buffer to read our single line reply
14601460
char inbuf[1024];
@@ -1484,7 +1484,7 @@ redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval
14841484
return 0;
14851485
}
14861486

1487-
PHPAPI int
1487+
PHP_REDIS_API int
14881488
redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret TSRMLS_DC) {
14891489
// Attempt to read the bulk reply
14901490
char *bulk_resp = redis_sock_read_bulk_reply(redis_sock, size TSRMLS_CC);
@@ -1499,7 +1499,7 @@ redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret TSRMLS_DC)
14991499
}
15001500
}
15011501

1502-
PHPAPI int
1502+
PHP_REDIS_API int
15031503
redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret TSRMLS_DC) {
15041504
int reply_info;
15051505
REDIS_REPLY_TYPE reply_type;
@@ -1547,7 +1547,7 @@ redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret
15471547
return 0;
15481548
}
15491549

1550-
PHPAPI int
1550+
PHP_REDIS_API int
15511551
redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab) {
15521552
// Reply type, and reply size vars
15531553
REDIS_REPLY_TYPE reply_type;

0 commit comments

Comments
 (0)