fix build on windows for PHP 7.4

Change-Id: Ia506f77f61abe116356ec7802ccd91fc4d647c1e
Reviewed-on: http://review.couchbase.org/121248
Tested-by: Build Bot <[email protected]>
Reviewed-by: Sergey Avseyev <[email protected]>

Author: avsej

couchbase.h

@@ -708,7 +708,7 @@ typedef struct {
 
 typedef struct {
     char *str;
-    uint len;
+    unsigned len;
 } pcbc_pp_id;
 
 typedef struct {

paramparser.c

@@ -48,7 +48,7 @@ static zend_always_inline int pcbc_get_parameters_array_ex(int param_count, PCBC
 
 #if PHP_VERSION_ID >= 70000
 #define PCBC_HASH_GET_CURRENT_DATA_EX(ht, pos) zend_hash_get_current_data_ex(ht, pos)
-static zend_always_inline int pcbc_hash_str_get_current_key_ex(HashTable *ht, char **str, uint *len,
+static zend_always_inline int pcbc_hash_str_get_current_key_ex(HashTable *ht, char **str, unsigned *len,
                                                                zend_ulong *num_index, HashPosition *pos)
 {
     zend_string *zstr = NULL;
@@ -72,10 +72,10 @@ static zend_always_inline PCBC_ZVAL *pcbc_hash_get_current_data_ex(HashTable *ht
     return result;
 }
 #define PCBC_HASH_GET_CURRENT_DATA_EX(ht, pos) pcbc_hash_get_current_data_ex(ht, pos)
-static zend_always_inline int pcbc_hash_str_get_current_key_ex(HashTable *ht, char **str, uint *len,
+static zend_always_inline int pcbc_hash_str_get_current_key_ex(HashTable *ht, char **str, unsigned *len,
                                                                zend_ulong *num_index, HashPosition *pos)
 {
-    uint len_out = 0;
+    unsigned len_out = 0;
     int key_type = zend_hash_get_current_key_ex(ht, str, &len_out, num_index, 0, pos);
     if (len != NULL) {
         *len = len_out - 1;
@@ -252,7 +252,7 @@ int pcbc_pp_next(pcbc_pp_state *state)
         PCBC_ZVAL *data;
         zend_ulong keyidx, key_type;
         char *keystr;
-        uint keystr_len;
+        unsigned keystr_len;
 
         data = PCBC_HASH_GET_CURRENT_DATA_EX(hash, &state->hash_pos);
         if (data == 0) {

src/couchbase/analytics_query.c

@@ -120,7 +120,7 @@ PHP_METHOD(AnalyticsQuery, namedParams)
         while (zend_hash_get_current_data_ex(Z_ARRVAL_P(params), (void **)&entry, &pos) == SUCCESS) {
             if (zend_hash_get_current_key_type_ex(Z_ARRVAL_P(params), &pos) == HASH_KEY_IS_STRING) {
                 char *key = NULL, *prefixed_key = NULL;
-                uint key_len = 0;
+                unsigned key_len = 0;
                 zend_hash_get_current_key_ex(Z_ARRVAL_P(params), &key, &key_len, NULL, 0, &pos);
                 spprintf(&prefixed_key, 0, "$%s", key);
                 add_assoc_zval(options, prefixed_key, *entry);

src/couchbase/n1ql_query.c

@@ -110,7 +110,7 @@ PHP_METHOD(N1qlQuery, namedParams)
         while (zend_hash_get_current_data_ex(Z_ARRVAL_P(params), (void **)&entry, &pos) == SUCCESS) {
             if (zend_hash_get_current_key_type_ex(Z_ARRVAL_P(params), &pos) == HASH_KEY_IS_STRING) {
                 char *key = NULL, *prefixed_key = NULL;
-                uint key_len = 0;
+                unsigned key_len = 0;
                 zend_hash_get_current_key_ex(Z_ARRVAL_P(params), &key, &key_len, NULL, 0, &pos);
                 spprintf(&prefixed_key, 0, "$%s", key);
                 add_assoc_zval(options, prefixed_key, *entry);

src/couchbase/spatial_view_query.c

@@ -305,7 +305,7 @@ PHP_METHOD(SpatialViewQuery, custom)
         while (zend_hash_get_current_data_ex(Z_ARRVAL_P(custom_options), (void **)&entry, &pos) == SUCCESS) {
             if (zend_hash_get_current_key_type_ex(Z_ARRVAL_P(custom_options), &pos) == HASH_KEY_IS_STRING) {
                 char *key = NULL;
-                uint key_len = 0;
+                unsigned key_len = 0;
                 zend_hash_get_current_key_ex(Z_ARRVAL_P(custom_options), &key, &key_len, NULL, 0, &pos);
                 add_assoc_zval_ex(obj->options, key, key_len, *entry);
                 PCBC_ADDREF_P(*entry);

src/couchbase/view_query.c

@@ -429,7 +429,7 @@ PHP_METHOD(ViewQuery, custom)
         while (zend_hash_get_current_data_ex(Z_ARRVAL_P(custom_options), (void **)&entry, &pos) == SUCCESS) {
             if (zend_hash_get_current_key_type_ex(Z_ARRVAL_P(custom_options), &pos) == HASH_KEY_IS_STRING) {
                 char *key = NULL;
-                uint key_len = 0;
+                unsigned key_len = 0;
                 zend_hash_get_current_key_ex(Z_ARRVAL_P(custom_options), &key, &key_len, NULL, 0, &pos);
                 add_assoc_zval_ex(obj->options, key, key_len, *entry);
                 PCBC_ADDREF_P(*entry);