Browse Source

make #ifdef's looks better for E_DEPRECATED

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@668 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 13 years ago
parent
commit
80634fd463
  1. 4
      utils.c
  2. 2
      utils.h

4
utils.c

@ -529,7 +529,7 @@ ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, int op
#define TG(x) (sandbox->tmp_##x)
#define OG(x) (sandbox->orig_##x)
/* }}} */
#ifdef E_STRICT
#if defined(E_STRICT) || defined(E_DEPRECATED)
static void xc_sandbox_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) /* {{{ */
{
xc_compilererror_t *compilererror;
@ -539,7 +539,9 @@ static void xc_sandbox_error_cb(int type, const char *error_filename, const uint
sandbox = (xc_sandbox_t *) XG(sandbox);
assert(sandbox != NULL);
switch (type) {
#ifdef E_STRICT:
case E_STRICT:
#endif
#ifdef E_DEPRECATED
case E_DEPRECATED:
#endif

2
utils.h

@ -97,7 +97,7 @@ typedef struct {
Bucket *tmp_internal_function_tail;
Bucket *tmp_internal_class_tail;
#ifdef E_STRICT
#if defined(E_STRICT) || defined(E_DEPRECATED)
int orig_user_error_handler_error_reporting;
void (*orig_zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
zend_uint compilererror_cnt;

Loading…
Cancel
Save