cvs: php4 / php4dll.dsp php4dllts.dsp /ext/odbc/ php_odbc.c
| From: | Zeev Suraski | Date: | Wed, 07 Jun 2000 18:10:21 +0000 |
| Subject: | cvs: php4 / php4dll.dsp php4dllts.dsp /ext/odbc/ php_odbc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72@lists.php.net to get a copy of this message | ||
zeev Wed Jun 7 11:10:21 2000 EDT
Modified files:
/php4 php4dll.dsp php4dllts.dsp
/php4/ext/odbc php_odbc.c
Log:
- Fix Win32 build
- Nuke a warning
Index: php4/php4dll.dsp
diff -u php4/php4dll.dsp:1.43 php4/php4dll.dsp:1.44
--- php4/php4dll.dsp:1.43 Wed May 17 16:49:26 2000
+++ php4/php4dll.dsp Wed Jun 7 11:10:21 2000
@@ -415,6 +415,10 @@
# 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 @@
# 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
@@ -656,6 +664,10 @@
# Begin Source File
SOURCE=.\ext\standard\reg.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\standard\scanf.h
# End Source File
# Begin Source File
Index: php4/php4dllts.dsp
diff -u php4/php4dllts.dsp:1.70 php4/php4dllts.dsp:1.71
--- php4/php4dllts.dsp:1.70 Fri Jun 2 21:16:45 2000
+++ php4/php4dllts.dsp Wed Jun 7 11:10:21 2000
@@ -482,6 +482,10 @@
# 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
@@ -655,6 +659,10 @@
# Begin Source File
SOURCE=.\ext\standard\reg.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\standard\scanf.h
# End Source File
# Begin Source File
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.53 php4/ext/odbc/php_odbc.c:1.54
--- php4/ext/odbc/php_odbc.c:1.53 Mon Jun 5 12:47:43 2000
+++ php4/ext/odbc/php_odbc.c Wed Jun 7 11:10:21 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.53 2000/06/05 19:47:43 andi Exp $ */
+/* $Id: php_odbc.c,v 1.54 2000/06/07 18:10:21 zeev Exp $ */
#ifdef COMPILE_DL_ODBC
#include "dl/phpdl.h"
@@ -607,7 +607,7 @@
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 @@
}
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);
}