summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/mssql/config.m46
-rw-r--r--ext/mssql/php_mssql.h3
2 files changed, 4 insertions, 5 deletions
diff --git a/ext/mssql/config.m4 b/ext/mssql/config.m4
index f9121dbf39..7007b1b94c 100644
--- a/ext/mssql/config.m4
+++ b/ext/mssql/config.m4
@@ -13,8 +13,8 @@ if test "$PHP_MSSQL" != "no"; then
if test "$PHP_MSSQL" = "yes"; then
for i in /usr/local /usr; do
- if test -f $i/freetds/include/tds.h; then
- FREETDS_INSTALLATION_DIR=$i/freetds
+ if test -f $i/include/tds.h; then
+ FREETDS_INSTALLATION_DIR=$i
break
fi
done
@@ -27,8 +27,6 @@ if test "$PHP_MSSQL" != "no"; then
if test -f $PHP_MSSQL/include/tds.h; then
FREETDS_INSTALLATION_DIR=$PHP_MSSQL
- elif test -f $PHP_MSSQL/freetds/include/tds.h; then
- FREETDS_INSTALLATION_DIR=$PHP_MSSQL/freetds
else
AC_MSG_ERROR(Directory $PHP_MSSQL is not a FreeTDS installation directory)
fi
diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h
index 92251a92ef..3da8c08c38 100644
--- a/ext/mssql/php_mssql.h
+++ b/ext/mssql/php_mssql.h
@@ -65,7 +65,8 @@
#define NO_MORE_RPC_RESULTS 3
#define dbfreelogin dbloginfree
#define dbrpcexec dbrpcsend
-typedef unsigned char *LPBYTE;
+typedef unsigned char *LPBYTE;
+typedef float DBFLT4;
#else
#define DBERRHANDLE(a, b) dbprocerrhandle(a, b)
#define DBMSGHANDLE(a, b) dbprocmsghandle(a, b)