no c++ comments // please

diff --git a/ext/mysql/libmysql/global.h b/ext/mysql/libmysql/global.h
index 9b8330f0359f2f4e18e22fc4340ad41ee30292f7..34b45c241876d3f343d5b5eb6b2c95ead8670f03 100644 (file)
--- a/ext/mysql/libmysql/global.h
+++ b/ext/mysql/libmysql/global.h
@@ -535,7 +535,7 @@ typedef ulonglong my_off_t;
 typedef unsigned long my_off_t;
 #endif
 #define MY_FILEPOS_ERROR       (~(my_off_t) 0)
-//typedef off_t os_off_t;
+/*typedef off_t os_off_t;*/
 
 typedef uint8          int7;   /* Most effective integer 0 <= x <= 127 */
 typedef short          int15;  /* Most effective integer 0 <= x <= 32767 */

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 8c1586b52f7cf2b95a4fe7a72bead2c7a26d5123..b477a3c1848b28ce1e50bed16d291f7e5b9f6b98 100644 (file)
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -56,9 +56,13 @@ AC_ARG_WITH(oci8,
       ORACLE_INCLUDE=-I$ORACLEINST_TOP/rdbms/demo
     fi
 
+    if test -d "$ORACLEINST_TOP/rdbms/public"
+    then
+      ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/rdbms/public"
+    fi
+
     if test -d "$ORACLEINST_TOP/network/public"
     then
-      # V8
       ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/network/public"
     fi