Re: [ZEND-ENGINE-CVS] cvs: Zend / zend.h

Make sure you also merge your changes into the ZendEngine2 tree. Andi At 08:53 28/05/2002 +0000, Venkat Raghavan S wrote:

rvenkat         Tue May 28 04:53:18 2002 EDT

Modified files:

    /Zend       zend.h

Log: Basic NetWare changes Index: Zend/zend.h diff -u Zend/zend.h:1.153 Zend/zend.h:1.154 --- Zend/zend.h:1.153 Wed Apr 3 19:24:33 2002 +++ Zend/zend.h Tue May 28 04:53:13 2002 @@ -17,7 +17,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: zend.h,v 1.153 2002/04/04 00:24:33 sniper Exp $ */ +/* $Id: zend.h,v 1.154 2002/05/28 08:53:13 rvenkat Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -41,6 +41,10 @@ #ifdef ZEND_WIN32 # include "zend_config.w32.h"

 # define ZEND_PATHS_SEPARATOR          ';'

+#elif defined(NETWARE) +# include "zend_config.nw.h" +# include "acconfig.h"

+# define ZEND_PATHS_SEPARATOR          ';'

#elif defined(__riscos__) # include "zend_config.h"

 # define ZEND_PATHS_SEPARATOR          ';'

@@ -128,7 +132,7 @@ # endif #endif -#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) +#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) # define do_alloca(p) alloca(p) # define free_alloca(p) #else -- Zend Engine CVS Mailing List (http://cvs.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php