Changeset 625 for branches/1.3/utils.h


Ignore:
Timestamp:
2009-07-05T11:01:49+02:00 (6 years ago)
Author:
moo
Message:

merged r541:559 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/utils.h

    r623 r625  
    22#include "xcache.h"
    33
    4 #ifdef DEBUG
     4#ifdef XCACHE_DEBUG
    55#   define IFDEBUG(x) (x)
    66int xc_vtrace(const char *fmt, va_list args);
     
    2525#   undef inline
    2626#   define inline
    27 #else /* DEBUG */
     27#else /* XCACHE_DEBUG */
    2828
    2929#   ifdef ZEND_WIN32
     
    4141#       define NDEBUG
    4242#   endif
    43 #endif /* DEBUG */
     43#endif /* XCACHE_DEBUG */
    4444#include <assert.h>
    4545
     
    101101    int orig_user_error_handler_error_reporting;
    102102#endif
     103
     104#ifdef ZEND_COMPILE_IGNORE_INTERNAL_CLASSES
     105    zend_uint orig_compiler_options;
     106#endif
    103107} xc_sandbox_t;
    104108
Note: See TracChangeset for help on using the changeset viewer.