Index: /trunk/utils.c
===================================================================
--- /trunk/utils.c	(revision 668)
+++ /trunk/utils.c	(revision 669)
@@ -530,5 +530,5 @@
 #define OG(x) (sandbox->orig_##x)
 /* }}} */
-#if defined(E_STRICT) || defined(E_DEPRECATED)
+#ifdef XCACHE_ERROR_CACHING
 static void xc_sandbox_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) /* {{{ */
 {
@@ -540,5 +540,5 @@
 	assert(sandbox != NULL);
 	switch (type) {
-#ifdef E_STRICT:
+#ifdef E_STRICT
 	case E_STRICT:
 #endif
@@ -740,5 +740,5 @@
 	sandbox->filename = filename;
 
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
 	sandbox->orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting);
 	EG(user_error_handler_error_reporting) = 0;
@@ -823,5 +823,5 @@
 	}
 
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
 	/* restore trigger errors */
 	for (i = 0; i < sandbox->compilererror_cnt; i ++) {
@@ -840,5 +840,5 @@
 {
 	XG(sandbox) = NULL;
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
 	EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting;
 	zend_error_cb = sandbox->orig_zend_error_cb;
@@ -886,5 +886,5 @@
 	memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
 
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
 	if (sandbox->compilererrors) {
 		zend_uint i;
Index: /trunk/utils.h
===================================================================
--- /trunk/utils.h	(revision 668)
+++ /trunk/utils.h	(revision 669)
@@ -74,4 +74,8 @@
 ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, int oplineno, zend_uchar type, zstr key, uint len, ulong h TSRMLS_DC);
 
+#if defined(E_STRICT) || defined(E_DEPRECATED)
+#define XCACHE_ERROR_CACHING
+#endif
+
 /* sandbox */
 typedef struct {
@@ -98,5 +102,5 @@
 	Bucket    *tmp_internal_class_tail;
 
-#if defined(E_STRICT) || defined(E_DEPRECATED)
+#ifdef XCACHE_ERROR_CACHING
 	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);
Index: /trunk/xcache.c
===================================================================
--- /trunk/xcache.c	(revision 668)
+++ /trunk/xcache.c	(revision 669)
@@ -756,5 +756,5 @@
 	}
 #endif
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
 	/* restore trigger errors */
 	for (i = 0; i < p->compilererror_cnt; i ++) {
@@ -1536,5 +1536,5 @@
 #undef X_FREE_UNUSED
 	/* }}} */
-#ifdef E_STRICT
+#ifdef XCACHE_ERROR_CACHING
 	php->compilererrors = ((xc_sandbox_t *) XG(sandbox))->compilererrors;
 	php->compilererror_cnt = ((xc_sandbox_t *) XG(sandbox))->compilererror_cnt;