From: Andrei Zmievski <andrei@php.net>
Date: Thu, 4 May 2006 21:29:21 +0000 (+0000)
Subject: Oops again.
X-Git-Tag: BEFORE_NEW_OUTPUT_API~305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d72d277d32f3dc38b7e32f97885cb08786f23486;p=php

Oops again.
---

diff --git a/Zend/zend.h b/Zend/zend.h
index ebd5f6a116..6046f614a2 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -246,6 +246,11 @@ typedef union _zstr {
 	void  *v;
 } zstr;
 
+#ifdef __GNUC__
+#	define ZSTR(x)    ((zstr)(x))
+#	define NULL_ZSTR  ZSTR((void*)NULL)
+#	define EMPTY_ZSTR ZSTR("\0\0")
+#else
 extern ZEND_API zstr null_zstr;
 extern ZEND_API zstr empty_zstr;
 
@@ -258,6 +263,7 @@ static inline zstr _to_zstr(void *v) {
 #	define ZSTR(x)    _to_zstr(x)
 #	define NULL_ZSTR  null_zstr
 #	define EMPTY_ZSTR empty_zstr
+#endif
 
 #define EMPTY_STR ((UChar*)"\0\0")