sixd            Mon Apr  7 21:55:20 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/oci8   config.m4 oci8_collection.c package2.xml 
  Log:
  PECL #13523 (x86_64 build).  Make OCI8 buildable with PHP 4.3.9.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.11.2.3&r2=1.55.2.3.2.11.2.4&diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.3 
php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.4
--- php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.3        Tue Mar 25 02:00:27 2008
+++ php-src/ext/oci8/config.m4  Mon Apr  7 21:55:20 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.55.2.3.2.11.2.3 2008/03/25 02:00:27 sixd Exp $
+dnl $Id: config.m4,v 1.55.2.3.2.11.2.4 2008/04/07 21:55:20 sixd Exp $
 dnl
 
 if test -z "$SED"; then
@@ -134,8 +134,8 @@
   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 @@
   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
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_collection.c?r1=1.5.2.3.2.7.2.3&r2=1.5.2.3.2.7.2.4&diff_format=u
Index: php-src/ext/oci8/oci8_collection.c
diff -u php-src/ext/oci8/oci8_collection.c:1.5.2.3.2.7.2.3 
php-src/ext/oci8/oci8_collection.c:1.5.2.3.2.7.2.4
--- php-src/ext/oci8/oci8_collection.c:1.5.2.3.2.7.2.3  Sat Mar 22 01:27:50 2008
+++ php-src/ext/oci8/oci8_collection.c  Mon Apr  7 21:55:20 2008
@@ -25,7 +25,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: oci8_collection.c,v 1.5.2.3.2.7.2.3 2008/03/22 01:27:50 sixd Exp $ */
+/* $Id: oci8_collection.c,v 1.5.2.3.2.7.2.4 2008/04/07 21:55:20 sixd Exp $ */
 
 
 
@@ -344,7 +344,13 @@
        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 @@
        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));
 
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/package2.xml?r1=1.1.2.8.2.2&r2=1.1.2.8.2.3&diff_format=u
Index: php-src/ext/oci8/package2.xml
diff -u php-src/ext/oci8/package2.xml:1.1.2.8.2.2 
php-src/ext/oci8/package2.xml:1.1.2.8.2.3
--- php-src/ext/oci8/package2.xml:1.1.2.8.2.2   Tue Feb 19 19:04:03 2008
+++ php-src/ext/oci8/package2.xml       Mon Apr  7 21:55:20 2008
@@ -298,7 +298,7 @@
  <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 @@
  </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>
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to