64-bit corrections to parameters to OnUpdateInt Bug #20994 (Dave)

@64-bit corrections to parameters to OnUpdateInt Bug #20994 (Dave)

diff --git a/ext/pfpro/php_pfpro.h b/ext/pfpro/php_pfpro.h
index 2ce98397674953c47a905e33aa23d728c7cf6111..1216b9aa3ee856a767d3d32d63a3b681d33aeb17 100644 (file)
--- a/ext/pfpro/php_pfpro.h
+++ b/ext/pfpro/php_pfpro.h
@@ -54,10 +54,10 @@ PHP_FUNCTION(pfpro_process);            /* Transaction processing     */
 ZEND_BEGIN_MODULE_GLOBALS(pfpro)
        int initialized;
        char *defaulthost;
-       int defaultport;
-       int defaulttimeout;
+       long defaultport;
+       long defaulttimeout;
        char *proxyaddress;
-       int proxyport;
+       long proxyport;
        char *proxylogon;
        char *proxypassword;
 ZEND_END_MODULE_GLOBALS(pfpro)

diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h
index 77cb8f3bd5ec14c1af8b801d56d3c87404b1930c..76ad22575439b3b1dda31c6feed8d69e3da1281a 100644 (file)
--- a/ext/skeleton/php_skeleton.h
+++ b/ext/skeleton/php_skeleton.h
@@ -30,7 +30,7 @@ PHP_FUNCTION(confirm_extname_compiled);       /* For testing, remove later. */
        and END macros here:     
 
 ZEND_BEGIN_MODULE_GLOBALS(extname)
-       int   global_value;
+       long  global_value;
        char *global_string;
 ZEND_END_MODULE_GLOBALS(extname)
 */

diff --git a/ext/yaz/php_yaz.h b/ext/yaz/php_yaz.h
index 458de163b43a352373fe5ec9a969ad9aea014393..02fe6dd1f5340928102d73e3bd0fe82466be5ebf 100644 (file)
--- a/ext/yaz/php_yaz.h
+++ b/ext/yaz/php_yaz.h
@@ -55,7 +55,7 @@ PHP_FUNCTION(yaz_schema);
 
 ZEND_BEGIN_MODULE_GLOBALS(yaz)
     int assoc_seq;
-    int max_links;
+    long max_links;
     char *log_file;
 ZEND_END_MODULE_GLOBALS(yaz)
     

diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 1435e7043e95bae1bd797df2d7e634150bde9fd7..c399862dc1c092ed5488cafe5c42cf52412d510c 100644 (file)
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -31,8 +31,8 @@ ZEND_BEGIN_MODULE_GLOBALS(zlib)
        uLong crc;
        int ob_gzhandler_status;
        int ob_gzip_coding;
-       int output_compression;
-       int output_compression_level;
+       long output_compression;
+       long output_compression_level;
        char *output_handler;
 ZEND_END_MODULE_GLOBALS(zlib)
 

diff --git a/main/php_globals.h b/main/php_globals.h
index ee13919bf7939c349e9670b93fb07ff38049bbb9..07cc122f59bae24f8c3d166d21cc240541bb0abd 100644 (file)
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -57,7 +57,7 @@ struct _php_core_globals {
        zend_bool allow_call_time_pass_reference;
        zend_bool implicit_flush;
 
-       int output_buffering;
+       long output_buffering;
 
        char *safe_mode_include_dir;
        zend_bool safe_mode_gid;