[BACK]Return to zend.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / Zend

Diff for /embedaddon/php/Zend/zend.h between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 12:34:35 version 1.1.1.3, 2013/07/22 01:32:15
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | Zend Engine                                                          |     | Zend Engine                                                          |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |     | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |      | that is bundled with this package in the file LICENSE, and is        | 
Line 180  char *alloca (); Line 180  char *alloca ();
 #endif  #endif
 #define restrict __restrict__  #define restrict __restrict__
   
#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__))#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
 # define ZEND_ALLOCA_MAX_SIZE (32 * 1024)  # define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
 # define ALLOCA_FLAG(name) \  # define ALLOCA_FLAG(name) \
         zend_bool name;          zend_bool name;
Line 350  struct _zval_struct { Line 350  struct _zval_struct {
 #define Z_UNSET_ISREF(z)                Z_UNSET_ISREF_P(&(z))  #define Z_UNSET_ISREF(z)                Z_UNSET_ISREF_P(&(z))
 #define Z_SET_ISREF_TO(z, isref)        Z_SET_ISREF_TO_P(&(z), isref)  #define Z_SET_ISREF_TO(z, isref)        Z_SET_ISREF_TO_P(&(z), isref)
   
   #if ZEND_DEBUG
   #define zend_always_inline inline
   #define zend_never_inline
   #else
 #if defined(__GNUC__)  #if defined(__GNUC__)
 #if __GNUC__ >= 3  #if __GNUC__ >= 3
 #define zend_always_inline inline __attribute__((always_inline))  #define zend_always_inline inline __attribute__((always_inline))
Line 358  struct _zval_struct { Line 362  struct _zval_struct {
 #define zend_always_inline inline  #define zend_always_inline inline
 #define zend_never_inline  #define zend_never_inline
 #endif  #endif
   
 #elif defined(_MSC_VER)  #elif defined(_MSC_VER)
 #define zend_always_inline __forceinline  #define zend_always_inline __forceinline
 #define zend_never_inline  #define zend_never_inline
Line 366  struct _zval_struct { Line 369  struct _zval_struct {
 #define zend_always_inline inline  #define zend_always_inline inline
 #define zend_never_inline  #define zend_never_inline
 #endif  #endif
   #endif /* ZEND_DEBUG */
   
 #if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX)  #if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX)
 # define EXPECTED(condition)   __builtin_expect(condition, 1)  # define EXPECTED(condition)   __builtin_expect(condition, 1)
Line 437  struct _zend_trait_precedence { Line 441  struct _zend_trait_precedence {
                   
         zend_class_entry** exclude_from_classes;          zend_class_entry** exclude_from_classes;
                   
        union _zend_function* function;        union _zend_function* function; /* FIXME: kept in 5.4 for BC, not used */
 };  };
 typedef struct _zend_trait_precedence zend_trait_precedence;  typedef struct _zend_trait_precedence zend_trait_precedence;
   
Line 455  struct _zend_trait_alias { Line 459  struct _zend_trait_alias {
         */          */
         zend_uint modifiers;          zend_uint modifiers;
                   
        union _zend_function* function;        union _zend_function* function; /* FIXME: kept in 5.4 for BC, not used */
 };  };
 typedef struct _zend_trait_alias zend_trait_alias;  typedef struct _zend_trait_alias zend_trait_alias;
   
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>