summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorThies C. Arntzen <thies@php.net>2000-03-26 14:27:10 +0000
committerThies C. Arntzen <thies@php.net>2000-03-26 14:27:10 +0000
commit7b31a193059ce2f4198f0977d68ec0cec634f6d5 (patch)
tree4e1886f9cdfa8eae84cbe47ba0d00fb6dc16f565 /ext
parent70003624fa91fedd6df822096fe53ad07f74bfa1 (diff)
downloadphp-git-7b31a193059ce2f4198f0977d68ec0cec634f6d5.tar.gz
no c++ comments // please
Diffstat (limited to 'ext')
-rw-r--r--ext/mysql/libmysql/global.h2
-rw-r--r--ext/oci8/config.m46
2 files changed, 6 insertions, 2 deletions
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