- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems)

diff --git a/NEWS b/NEWS
index dd9cc2f02dca7517e724b427e13f88558b76142a..621bae335a69816a6619399280c3b92114e27f97 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP 4                                                                      NEWS
 - Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
 - Fixed bug #32813 (parse_url() does not handle scheme-only urls properly). (Ilia)
 - Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
+- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
 - Fixed bug #32730 (ext/crack.c fails to compile with cracklib-2.8.3). (Jani)
 - Fixed bug #32670 (foreach() does not issue warning on unset array arg). (Ilia)
 - Fixed bug #32699 (pg_affected_rows() was defined when it was not available).

diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index f1cfbec2d2ba99a9661d20fec7bf4f5df4173f9c..21460103ea1dc90dd45696e0d9655b195f3b798d 100644 (file)
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -216,7 +216,7 @@ typedef struct odbc_connection {
 typedef struct odbc_result_value {
        char name[32];
        char *value;
-       long int vallen;
+       SDWORD vallen;
        SDWORD coltype;
 } odbc_result_value;