cvs: /php4/ext/mysql/libmysql global.h /php4/ext/oci8 config.m4
| From: | Thies C. Arntzen | Date: | Sun, 26 Mar 2000 14:27:40 +0000 |
| Subject: | cvs: /php4/ext/mysql/libmysql global.h /php4/ext/oci8 config.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-12625@lists.php.net to get a copy of this message | ||
thies Sun Mar 26 06:27:40 2000 EDT
Modified files:
/php4/ext/mysql/libmysql global.h
/php4/ext/oci8 config.m4
Log:
no c++ comments // please
Index: php4/ext/mysql/libmysql/global.h
diff -u php4/ext/mysql/libmysql/global.h:1.2 php4/ext/mysql/libmysql/global.h:1.3
--- php4/ext/mysql/libmysql/global.h:1.2 Tue Feb 22 21:25:28 2000
+++ php4/ext/mysql/libmysql/global.h Sun Mar 26 06:27:10 2000
@@ -535,7 +535,7 @@
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 */
Index: php4/ext/oci8/config.m4
diff -u php4/ext/oci8/config.m4:1.11 php4/ext/oci8/config.m4:1.12
--- php4/ext/oci8/config.m4:1.11 Thu Dec 30 04:27:08 1999
+++ php4/ext/oci8/config.m4 Sun Mar 26 06:27:10 2000
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.11 1999/12/30 12:27:08 thies Exp $
+dnl $Id: config.m4,v 1.12 2000/03/26 14:27:10 thies Exp $
AC_DEFUN(AC_ORACLE_VERSION,[
AC_MSG_CHECKING([Oracle version])
@@ -56,9 +56,13 @@
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