MFB

diff --git a/ext/mssql/config.m4 b/ext/mssql/config.m4
index f9121dbf39f599252342a224e41028b027856b67..7007b1b94c44bf558ac99d8a8a239a1130426e4e 100644 (file)
--- 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 92251a92ef81a5e2af98ad7ce7a9f87ba371278c..3da8c08c3833d2c03172b2ce6159681d058c4b92 100644 (file)
--- 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)