From 80634fd4635e1ef1cb5a610955d32d5c43507e2f Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Fri, 7 Aug 2009 02:26:35 +0000
Subject: [PATCH] make #ifdef's looks better for E_DEPRECATED

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@668 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 utils.c | 4 +++-
 utils.h | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/utils.c b/utils.c
index 32d0e88..b457324 100644
--- a/utils.c
+++ b/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
diff --git a/utils.h b/utils.h
index d9554c9..b186b39 100644
--- a/utils.h
+++ b/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;