no c++ comments // please

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 */

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