From: Zeev Suraski <zeev@php.net>
Date: Wed, 7 Jun 2000 18:10:21 +0000 (+0000)
Subject: - Fix Win32 build
X-Git-Tag: PRE_EIGHT_BYTE_ALLOC_PATCH~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=022159a6cd3c8a805366794c351655182d5c876f;p=php

- Fix Win32 build
- Nuke a warning
---

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 7a2260ae0c..908292cba2 100644
--- 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 886146ca77..7f8b6a6792 100644
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -415,6 +415,10 @@ SOURCE=.\ext\standard\lcg.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\ext\standard\levenshtein.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\ext\standard\link.c
 # End Source File
 # Begin Source File
@@ -495,6 +499,10 @@ SOURCE=.\ext\standard\reg.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\ext\standard\scanf.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\ext\session\session.c
 # End Source File
 # Begin Source File
@@ -659,6 +667,10 @@ SOURCE=.\ext\standard\reg.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ext\standard\scanf.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\ext\standard\type.h
 # End Source File
 # Begin Source File
diff --git a/php4dllts.dsp b/php4dllts.dsp
index f09edf6bde..2d36fe4c9b 100644
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -482,6 +482,10 @@ SOURCE=.\ext\standard\reg.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\ext\standard\scanf.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\ext\session\session.c
 # End Source File
 # Begin Source File
@@ -658,6 +662,10 @@ SOURCE=.\ext\standard\reg.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ext\standard\scanf.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\ext\standard\type.h
 # End Source File
 # Begin Source File