Changeset 211 for branches/1.0/utils.c

Timestamp:

10/02/2006 01:15:04 AM (2 years ago)

Author:

moo

Message:

trunk->b1.0 [209] [210]: conflict between sandbox and user error handler

Files:

• branches/1.0/utils.c (modified) (3 diffs)

branches/1.0/utils.c

@@ -335 +335 @@
     sandbox->filename = filename;
 
+#ifdef E_STRICT
+    sandbox->orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting);
+    EG(user_error_handler_error_reporting) &= ~E_STRICT;
+#endif
+
     return sandbox;
 }
@@ -357 +362 @@
     /* install class */
     while (b != NULL) {
-        xc_install_class(sandbox->filename, (xc_cest_t*)b->pData,
+        xc_install_class(sandbox->filename, (xc_cest_t*) b->pData,
                 BUCKET_KEY_TYPE(b), BUCKET_KEY(b), b->nKeyLength TSRMLS_CC);
         b = b->pListNext;
@@ -397 +402 @@
     memcpy(&CG(open_files),     &OG(open_files),     sizeof(CG(open_files)));
 
+#ifdef E_STRICT
+    EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting;
+#endif
+
     if (sandbox->alloc) {
         efree(sandbox);