cvs: /php4 php.h php_globals.h

rasmus Sat Sep 4 18:06:13 1999 EDT Modified files: /php4 php.h php_globals.h Log: 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. Index: php4/php.h diff -u php4/php.h:1.28 php4/php.h:1.29 --- php4/php.h:1.28 Sat Sep 4 16:12:47 1999 +++ php4/php.h Sat Sep 4 18:06:12 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.28 1999/09/04 20:12:47 rasmus Exp $ */ +/* $Id: php.h,v 1.29 1999/09/04 22:06:12 rasmus Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -314,10 +314,10 @@ #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" Index: php4/php_globals.h diff -u php4/php_globals.h:1.20 php4/php_globals.h:1.21 --- php4/php_globals.h:1.20 Sat Sep 4 16:12:47 1999 +++ php4/php_globals.h Sat Sep 4 18:06:12 1999 @@ -44,24 +44,24 @@ struct _php_core_globals { - long magic_quotes_gpc; - long magic_quotes_runtime; - long magic_quotes_sybase; - - long asp_tags; - long short_tags; - long output_buffering; + zend_bool magic_quotes_gpc; + zend_bool magic_quotes_runtime; + zend_bool magic_quotes_sybase; + + 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 @@ 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;