cvs: /php4 NEWS /php4/ext/odbc php_odbc.c
| From: | Nick Gorham | Date: | Sun, 16 Apr 2000 16:17:29 +0000 |
| Subject: | cvs: /php4 NEWS /php4/ext/odbc php_odbc.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-13609@lists.php.net to get a copy of this message | ||
lurcher Sun Apr 16 09:17:29 2000 EDT
Modified files:
/php4 NEWS
/php4/ext/odbc php_odbc.c
Log:
Removed unnecessary FAR's (I am assuming we don't need to work under
16 bit windows). They break several ODBC builds.
Index: php4/NEWS
diff -u php4/NEWS:1.199 php4/NEWS:1.200
--- php4/NEWS:1.199 Sat Apr 15 18:09:12 2000
+++ php4/NEWS Sun Apr 16 09:16:58 2000
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2000, Version 4.0.0 Release
+- Removed Windows FAR* in php_odbc.c (lurcher)
- Fix bug in number_format (Jon Forsberg)
- Make error_prepend_string and error_append_string work
- array_walk() now automatically resets the array. (Andrei)
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.40 php4/ext/odbc/php_odbc.c:1.41
--- php4/ext/odbc/php_odbc.c:1.40 Thu Apr 6 14:07:40 2000
+++ php4/ext/odbc/php_odbc.c Sun Apr 16 09:16:59 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.40 2000/04/06 21:07:40 cmv Exp $ */
+/* $Id: php_odbc.c,v 1.41 2000/04/16 16:16:59 lurcher Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
@@ -847,10 +847,10 @@
char buf[4096];
int fp, nbytes;
while(rc == SQL_NEED_DATA) {
- rc = SQLParamData(result->stmt, (PTR FAR *)&fp);
+ rc = SQLParamData(result->stmt, (void*)&fp);
if (rc == SQL_NEED_DATA) {
while((nbytes = read(fp, &buf, 4096)) > 0)
- SQLPutData(result->stmt,(UCHAR FAR*) &buf, nbytes);
+ SQLPutData(result->stmt, (void*)&buf, nbytes);
}
}
} else {