diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/interbase/ibase_blobs.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/interbase/ibase_blobs.c')
| -rw-r--r-- | ext/interbase/ibase_blobs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c index 8b8d731d7b..b188e54e4f 100644 --- a/ext/interbase/ibase_blobs.c +++ b/ext/interbase/ibase_blobs.c @@ -239,7 +239,7 @@ PHP_FUNCTION(ibase_blob_create) PHP_FUNCTION(ibase_blob_open) { char *blob_id; - int blob_id_len; + size_t blob_id_len; zval *link = NULL; ibase_db_link *ib_link; ibase_trans *trans = NULL; @@ -406,7 +406,7 @@ PHP_FUNCTION(ibase_blob_cancel) PHP_FUNCTION(ibase_blob_info) { char *blob_id; - int blob_id_len; + size_t blob_id_len; zval *link = NULL; ibase_db_link *ib_link; ibase_trans *trans = NULL; @@ -482,7 +482,7 @@ PHP_FUNCTION(ibase_blob_info) PHP_FUNCTION(ibase_blob_echo) { char *blob_id; - int blob_id_len; + size_t blob_id_len; zval *link = NULL; ibase_db_link *ib_link; ibase_trans *trans = NULL; |