- Fix Win32 build

- Nuke a warning

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 7a2260ae0c285b46a0e20b7facc0d55b9b9557c2..908292cba260a418b51eefc8ba90271f9ac1be30 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -607,7 +607,7 @@ static int _close_pconn_with_id(list_entry *le, int *id)
 void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
 {
        odbc_result *result;
-       SDWORD len;
+       SQLINTEGER len;
        pval **pv_res, **pv_num;
 
        if (zend_get_parameters_ex(2, &pv_res, &pv_num) == FAILURE) {
@@ -634,7 +634,8 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
        }
 
        SQLColAttributes(result->stmt, (UWORD)(*pv_num)->value.lval, 
-                                       (type?SQL_COLUMN_SCALE:SQL_COLUMN_PRECISION), NULL, 0, NULL, &len);
+                                       (SQLUSMALLINT) (type?SQL_COLUMN_SCALE:SQL_COLUMN_PRECISION),
+                                       NULL, 0, NULL, &len);
 
        RETURN_LONG(len);
 }

diff --git a/php4dll.dsp b/php4dll.dsp
index 886146ca77c31b840e0c9aace0eb661950b0dcf8..7f8b6a679237d3b5d83e217e62c84fb222ae9cbe 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -415,6 +415,10 @@ SOURCE=.\ext\standard\lcg.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\standard\levenshtein.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\standard\link.c\r
 # End Source File\r
 # Begin Source File\r
@@ -495,6 +499,10 @@ SOURCE=.\ext\standard\reg.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\standard\scanf.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\session\session.c\r
 # End Source File\r
 # Begin Source File\r
@@ -659,6 +667,10 @@ SOURCE=.\ext\standard\reg.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\standard\scanf.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\standard\type.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index f09edf6bde9ca372f36704fe3db16404c9a1a6a1..2d36fe4c9b8e2aa638f6374f11173222aec75524 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -482,6 +482,10 @@ SOURCE=.\ext\standard\reg.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\standard\scanf.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\session\session.c\r
 # End Source File\r
 # Begin Source File\r
@@ -658,6 +662,10 @@ SOURCE=.\ext\standard\reg.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\standard\scanf.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\standard\type.h\r
 # End Source File\r
 # Begin Source File\r