clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

PECL #13523 (x86_64 build). Make OCI8 buildable with PHP 4.3.9.

Browse Source
This commit is contained in:
Christopher Jones 2008-04-07 21:55:20 +00:00
parent 6522f85412
commit 51c5220adb
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/oci8/config.m4
View File

@ -134,8 +134,8 @@ if test "$PHP_OCI8" != "no"; then
IFS=$ac_IFS
oci8_php_version=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
if test "$oci8_php_version" -le "4003010"; then
AC_MSG_ERROR([You need at least PHP 4.3.10 to be able to use this version of OCI8. PHP $php_version found])
if test "$oci8_php_version" -lt "4003009"; then
AC_MSG_ERROR([You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found])
else
AC_MSG_RESULT([$php_version, ok])
fi
@ -328,7 +328,7 @@ dnl version in /usr/lib
AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
dnl Header directory for Instant Client SDK RPM install
OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'`
OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'`
dnl Header directory for Instant Client SDK zip file install
OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include

12
ext/oci8/oci8_collection.c
View File

@ -344,7 +344,13 @@ int php_oci_collection_append_number(php_oci_collection *collection, char *numbe
OCINumber oci_number;
php_oci_connection *connection = collection->connection;
#if (PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10)
/* minimum PHP version ext/oci8/config.m4 accepts is 4.3.9 */
element_double = strtod(number, NULL);
#else
/* zend_strtod was introduced in PHP 4.3.10 */
element_double = zend_strtod(number, NULL);
#endif
PHP_OCI_CALL_RETURN(connection->errcode, OCINumberFromReal, (connection->err, &element_double, sizeof(double), &oci_number));
@ -626,7 +632,13 @@ int php_oci_collection_element_set_number(php_oci_collection *collection, long i
OCINumber oci_number;
php_oci_connection *connection = collection->connection;
#if (PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10)
/* minimum PHP version ext/oci8/config.m4 accepts is 4.3.9 */
element_double = strtod(number, NULL);
#else
/* zend_strtod was introduced in PHP 4.3.10 */
element_double = zend_strtod(number, NULL);
#endif
PHP_OCI_CALL_RETURN(connection->errcode, OCINumberFromReal, (connection->err, &element_double, sizeof(double), &oci_number));

4
ext/oci8/package2.xml
View File

@ -298,7 +298,7 @@ Refine DRCP connection pooling functionality
<dependencies>
<required>
<php>
<min>4.3.11</min>
<min>4.3.9</min>
<max>6.0.0</max>
<exclude>6.0.0</exclude>
</php>
@ -309,7 +309,7 @@ Refine DRCP connection pooling functionality
</dependencies>
<providesextension>oci8</providesextension>
<extsrcrelease>
<configureoption default="autodetect" name="with-oci8" prompt="Please provide the path to ORACLE_HOME dir. Use &apos;instantclient,/path/to/instant/client/lib&apos; if you&apos;re compiling with Oracle Instant Client" />
<configureoption default="autodetect" name="with-oci8" prompt="Please provide the path to the ORACLE_HOME directory. Use &apos;instantclient,/path/to/instant/client/lib&apos; if you&apos;re compiling with Oracle Instant Client" />
</extsrcrelease>
<changelog>