summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <christopher.jones@oracle.com>2016-04-14 15:49:52 +1000
committerChristopher Jones <christopher.jones@oracle.com>2016-04-14 15:49:52 +1000
commit9d76e012cf25c2f6173419fc281c6f756a035371 (patch)
treec72a7f0451925719e5dfcde2c0a852e7a6cfb4c3
parent81f038961191c90f3ea7146417e259814f4ab41c (diff)
parentec358dac030b21c963c09892bf168cd6ad145425 (diff)
downloadphp-git-9d76e012cf25c2f6173419fc281c6f756a035371.tar.gz
Merge branch 'PHP-7.0'
-rw-r--r--ext/oci8/oci8_statement.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
index 5fc21c2fbd..55983d3e9f 100644
--- a/ext/oci8/oci8_statement.c
+++ b/ext/oci8/oci8_statement.c
@@ -1149,7 +1149,8 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
return 1;
}
convert_to_long(var);
-#if defined(OCI_MAJOR_VERSION) && OCI_MAJOR_VERSION > 10
+#if defined(OCI_MAJOR_VERSION) && (OCI_MAJOR_VERSION > 10) && \
+ (defined(__x86_64__) || defined(__LP64__) || defined(_LP64) || defined(_WIN64))
bind_data = (ub8 *)&Z_LVAL_P(var);
value_sz = sizeof(ub8);
#else