first shot on merging the core fro the int64 branch

1 files changed, 10 insertions, 10 deletions

diff --git a/main/php_globals.h b/main/php_globals.h
index 9baabf757c..defb220c76 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -56,7 +56,7 @@ typedef struct _arg_separators {
 struct _php_core_globals {
 	zend_bool implicit_flush;
 
-	long output_buffering;
+	zend_int_t output_buffering;
 
 	zend_bool sql_safe_mode;
 	zend_bool enable_dl;
@@ -64,16 +64,16 @@ struct _php_core_globals {
 	char *output_handler;
 
 	char *unserialize_callback_func;
-	long serialize_precision;
+	zend_int_t serialize_precision;
 
-	long memory_limit;
-	long max_input_time;
+	zend_int_t memory_limit;
+	zend_int_t max_input_time;
 
 	zend_bool track_errors;
 	zend_bool display_errors;
 	zend_bool display_startup_errors;
 	zend_bool log_errors;
-	long      log_errors_max_len;
+	zend_int_t      log_errors_max_len;
 	zend_bool ignore_repeated_errors;
 	zend_bool ignore_repeated_source;
 	zend_bool report_memleaks;
@@ -88,7 +88,7 @@ struct _php_core_globals {
 	char *sys_temp_dir;
 
 	char *upload_tmp_dir;
-	long upload_max_filesize;
+	zend_int_t upload_max_filesize;
 	
 	char *error_append_string;
 	char *error_prepend_string;
@@ -126,7 +126,7 @@ struct _php_core_globals {
 	zend_bool html_errors;
 	zend_bool xmlrpc_errors;
 
-	long xmlrpc_error_number;
+	zend_int_t xmlrpc_error_number;
 
 	zend_bool activated_auto_globals[8];
 
@@ -149,12 +149,12 @@ struct _php_core_globals {
 #ifdef PHP_WIN32
 	zend_bool com_initialized;
 #endif
-	long max_input_nesting_level;
-	long max_input_vars;
+	zend_int_t max_input_nesting_level;
+	zend_int_t max_input_vars;
 	zend_bool in_user_include;
 
 	char *user_ini_filename;
-	long user_ini_cache_ttl;
+	zend_int_t user_ini_cache_ttl;
 
 	char *request_order;