Skip to content

PHPC-527: Fix PR #185 #191

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

PHPC-527: Fix PR #185 #191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6cc67b
Fix PHP 7 / 32bits build
remicollet Dec 26, 2015
afa67ac
PHPC-527: fix call to add_index_stringl
remicollet Dec 30, 2015
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
8 changes: 6 additions & 2 deletions phongo_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@
int tmp_len; \
mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
tmp_len = spprintf(&tmp, 0, "%lld", value); \
add_index_stringl(zval, index, tmp, tmp_len, 0); \
ADD_INDEX_STRINGL(zval, index, tmp, tmp_len); \
efree(tmp); \
} else { \
add_index_long(zval, index, val); \
}
Expand All @@ -109,7 +110,8 @@
int tmp_len; \
mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
tmp_len = spprintf(&tmp, 0, "%lld", value); \
add_assoc_stringl(zval, key, tmp, tmp_len, 0); \
ADD_ASSOC_STRINGL(zval, key, tmp, tmp_len); \
efree(tmp); \
} else { \
add_assoc_long(zval, key, value); \
}
Expand Down Expand Up @@ -165,6 +167,7 @@
# define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value);
# define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRL(_key));
# define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRL(_key), _value);
# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len);
# define phongo_free_object_arg zend_object
# define phongo_zpp_char_len size_t
# define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount
Expand All @@ -191,6 +194,7 @@
# define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value);
# define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRS(_key));
# define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRS(_key), _value);
# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len, 0);
# define Z_PHPDATE_P(object) zend_object_store_get_object(object TSRMLS_CC)
# define Z_ISUNDEF(x) !x
# define phongo_free_object_arg void
Expand Down