cvs: php4(PHP_4) /main php.h

sas Sat Apr 19 14:36:12 2003 EDT Modified files: (Branch: PHP_4) /php4/main php.h Log: MFH Index: php4/main/php.h diff -u php4/main/php.h:1.178.2.1 php4/main/php.h:1.178.2.1.2.1 --- php4/main/php.h:1.178.2.1 Tue Dec 31 11:26:13 2002 +++ php4/main/php.h Sat Apr 19 14:36:12 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.178.2.1 2002/12/31 16:26:13 sebastian Exp $ */ +/* $Id: php.h,v 1.178.2.1.2.1 2003/04/19 18:36:12 sas Exp $ */ #ifndef PHP_H #define PHP_H @@ -341,10 +341,18 @@ /* Output support */ #include "main/php_output.h" #define PHPWRITE(str, str_len) php_body_write((str), (str_len) TSRMLS_CC) -#define PUTS(str) php_body_write((str), strlen((str)) TSRMLS_CC) +#define PUTS(str) do { \ + const char *__str = (str); \ + php_body_write(__str, strlen(__str) TSRMLS_CC); \ +} while (0) + #define PUTC(c) (php_body_write(&(c), 1 TSRMLS_CC), (c)) #define PHPWRITE_H(str, str_len) php_header_write((str), (str_len) TSRMLS_CC) -#define PUTS_H(str) php_header_write((str), strlen((str)) TSRMLS_CC) +#define PUTS_H(str) do { \ + const char *__str = (str); \ + php_header_write(__str, strlen(__str) TSRMLS_CC); \ +} while (0) + #define PUTC_H(c) (php_header_write(&(c), 1 TSRMLS_CC), (c)) #ifdef ZTS