fix config.m4

add fold markers

diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index 0f0b6a78e1e6772d6ca50b98ed436bf1bf886dee..7b31a953fc0553a19a30fbab04a744c08a99d1b0 100755 (executable)
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -7,7 +7,7 @@ AC_DEFUN(AC_PDO_OCI_VERSION,[
     test -z "$PDO_OCI_VERSION" && PDO_OCI_VERSION=7.3
   elif test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
     PDO_OCI_VERSION=10.1    
-  elif test -f $OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
+  elif test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
     PDO_OCI_VERSION=9.0
   elif test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
     PDO_OCI_VERSION=8.1
@@ -39,7 +39,7 @@ if test "$PHP_PDO_OCI" != "no"; then
 
   if test -d "$PDO_OCI_DIR/rdbms/public"; then
     PHP_ADD_INCLUDE($PDO_OCI_DIR/rdbms/public)
-    PDO_OCI_INCLUDES="$OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/public"
+    PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/public"
   fi
   if test -d "$PDO_OCI_DIR/rdbms/demo"; then
     PHP_ADD_INCLUDE($PDO_OCI_DIR/rdbms/demo)
@@ -47,7 +47,7 @@ if test "$PHP_PDO_OCI" != "no"; then
   fi
   if test -d "$PDO_OCI_DIR/network/public"; then
     PHP_ADD_INCLUDE($PDO_OCI_DIR/network/public)
-    OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/network/public"
+    PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/network/public"
   fi
   if test -d "$PDO_OCI_DIR/plsql/public"; then
     PHP_ADD_INCLUDE($PDO_OCI_DIR/plsql/public)
@@ -112,7 +112,7 @@ if test "$PHP_PDO_OCI" != "no"; then
   ], [
     PHP_CHECK_LIBRARY(ocijdbc8, OCILobIsTemporary,
     [
-      PHP_ADD_LIBRARY(ocijdbc8, 1, OCI_SHARED_LIBADD)
+      PHP_ADD_LIBRARY(ocijdbc8, 1, PDO_OCI_SHARED_LIBADD)
       AC_DEFINE(HAVE_OCILOBISTEMPORARY,1,[ ])
     ], [], [
       -L$PDO_OCI_DIR/lib $PDO_OCI_SHARED_LIBADD

diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index 0d93f58884353a2a526d00424c1aeef74649b0ea..6d56186296add85c029508923f03120c02ad6956 100755 (executable)
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -30,7 +30,7 @@
 #include "php_pdo_oci.h"
 #include "php_pdo_oci_int.h"
 
-static int pdo_oci_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info TSRMLS_DC)
+static int pdo_oci_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info TSRMLS_DC) /* {{{ */
 {
        pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
        pdo_oci_error_info *einfo;
@@ -50,6 +50,7 @@ static int pdo_oci_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info
 
        return 1;
 }
+/* }}} */
 
 ub4 _oci_error(OCIError *err, pdo_dbh_t *dbh, pdo_stmt_t *stmt, char *what, sword status, const char *file, int line TSRMLS_DC) /* {{{ */
 {
@@ -187,7 +188,7 @@ static int oci_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-static int oci_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len, pdo_stmt_t *stmt, long options, zval *driver_options TSRMLS_DC)
+static int oci_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len, pdo_stmt_t *stmt, long options, zval *driver_options TSRMLS_DC) /* {{{ */
 {
        pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
        pdo_oci_stmt *S = ecalloc(1, sizeof(*S));
@@ -217,8 +218,9 @@ static int oci_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len, pd
        
        return 1;
 }
+/* }}} */
 
-static long oci_handle_doer(pdo_dbh_t *dbh, const char *sql, long sql_len TSRMLS_DC)
+static long oci_handle_doer(pdo_dbh_t *dbh, const char *sql, long sql_len TSRMLS_DC) /* {{{ */
 {
        pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
        OCIStmt         *stmt;
@@ -260,21 +262,24 @@ static long oci_handle_doer(pdo_dbh_t *dbh, const char *sql, long sql_len TSRMLS
        
        return ret;
 }
+/* }}} */
 
-static int oci_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int unquotedlen, char **quoted, int *quotedlen  TSRMLS_DC)
+static int oci_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int unquotedlen, char **quoted, int *quotedlen  TSRMLS_DC) /* {{{ */
 {
        pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
 
        return 0;
 }
+/* }}} */
 
-static int oci_handle_begin(pdo_dbh_t *dbh TSRMLS_DC)
+static int oci_handle_begin(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
 {
        /* with Oracle, there is nothing special to be done */
        return 1;
 }
+/* }}} */
 
-static int oci_handle_commit(pdo_dbh_t *dbh TSRMLS_DC)
+static int oci_handle_commit(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
 {
        pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
 
@@ -286,8 +291,9 @@ static int oci_handle_commit(pdo_dbh_t *dbh TSRMLS_DC)
        }
        return 1;
 }
+/* }}} */
 
-static int oci_handle_rollback(pdo_dbh_t *dbh TSRMLS_DC)
+static int oci_handle_rollback(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
 {
        pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
 
@@ -299,8 +305,9 @@ static int oci_handle_rollback(pdo_dbh_t *dbh TSRMLS_DC)
        }
        return 1;
 }
+/* }}} */
 
-static int oci_handle_set_attribute(pdo_dbh_t *dbh, long attr, zval *val TSRMLS_DC)
+static int oci_handle_set_attribute(pdo_dbh_t *dbh, long attr, zval *val TSRMLS_DC) /* {{{ */
 {
        pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
 
@@ -325,6 +332,7 @@ static int oci_handle_set_attribute(pdo_dbh_t *dbh, long attr, zval *val TSRMLS_
        }
        
 }
+/* }}} */
 
 static struct pdo_dbh_methods oci_methods = {
        oci_handle_closer,