From: Sascha Schumann <sas@php.net>
Date: Sat, 19 Apr 2003 18:35:51 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-4.3.2RC2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dafae56b92f42d37d91d52b281b6df90de37285;p=php

MFH
---

diff --git a/main/php.h b/main/php.h
index d7a2308bd4..66ca21121b 100644
--- a/main/php.h
+++ b/main/php.h
@@ -341,10 +341,18 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 /* 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