Cleanups

What the heck was that dangling (c) for in the PUTC macros?  Were they
supposed to serve some sort of purpose, because I sure don't see one for
them.

2 files changed, 16 insertions, 16 deletions

diff --git a/main/php.h b/main/php.h
index 9bc697dd5b..36e8e66bf9 100644
--- a/main/php.h
+++ b/main/php.h
@@ -314,10 +314,10 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 #include "output.h"
 #define PHPWRITE(str, str_len)		zend_body_write((str), (str_len))
 #define PUTS(str)					zend_body_write((str), strlen((str)))
-#define PUTC(c)						zend_body_write(&(c), 1), (c)
+#define PUTC(c)						zend_body_write(&(c), 1)
 #define PHPWRITE_H(str, str_len)	zend_header_write((str), (str_len))
 #define PUTS_H(str)					zend_header_write((str), strlen((str)))
-#define PUTC_H(c)					zend_header_write(&(c), 1), (c)
+#define PUTC_H(c)					zend_header_write(&(c), 1)
 
 
 #include "zend_operators.h"
diff --git a/main/php_globals.h b/main/php_globals.h
index 054ef07c8b..6e77339671 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -44,24 +44,24 @@ extern ZEND_API php_core_globals core_globals;
 
 
 struct _php_core_globals {
-	long magic_quotes_gpc;
-	long magic_quotes_runtime;
-	long magic_quotes_sybase;
+	zend_bool magic_quotes_gpc;
+	zend_bool magic_quotes_runtime;
+	zend_bool magic_quotes_sybase;
 
-	long asp_tags;
-	long short_tags;
-	long output_buffering;
+	zend_bool asp_tags;
+	zend_bool short_tags;
+	zend_bool output_buffering;
 
-	long safe_mode;
-	long sql_safe_mode;
+	zend_bool safe_mode;
+	zend_bool sql_safe_mode;
 	char *safe_mode_exec_dir;
-	long enable_dl;
+	zend_bool enable_dl;
 
 	long memory_limit;
 
-	long track_errors;
-	long display_errors;
-	long log_errors;
+	zend_bool track_errors;
+	zend_bool display_errors;
+	zend_bool log_errors;
 	char *error_log;
 
 	char *doc_root;
@@ -79,9 +79,9 @@ struct _php_core_globals {
 	char *arg_separator;
 	char *gpc_order;
 
-	long track_vars;
+	zend_bool track_vars;
 
-	long y2k_compliance;
+	zend_bool y2k_compliance;
 
 	short connection_status;
 	short ignore_user_abort;