From: Thies C. Arntzen <thies@php.net>
Date: Sun, 26 Mar 2000 14:27:10 +0000 (+0000)
Subject: no c++ comments // please
X-Git-Tag: PHP-4.0-RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b31a193059ce2f4198f0977d68ec0cec634f6d5;p=php

no c++ comments // please
---

diff --git a/ext/mysql/libmysql/global.h b/ext/mysql/libmysql/global.h
index 9b8330f035..34b45c2418 100644
--- 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 8c1586b52f..b477a3c184 100644
--- 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