Index: src/tests/raii/.expect/dtor-early-exit-ERR1.txt
===================================================================
--- src/tests/raii/.expect/dtor-early-exit-ERR1.txt	(revision cfcf670b523fa98125d93269a28ba85a6d64f5b6)
+++ src/tests/raii/.expect/dtor-early-exit-ERR1.txt	(revision e765794661ef77000b2d019da818d8d79d4bbce0)
@@ -1,3 +1,3 @@
-raii/dtor-early-exit.c:153:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
+raii/dtor-early-exit.c:150:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
   with target: L1
   with original target: L1
Index: src/tests/raii/.expect/dtor-early-exit-ERR2.txt
===================================================================
--- src/tests/raii/.expect/dtor-early-exit-ERR2.txt	(revision cfcf670b523fa98125d93269a28ba85a6d64f5b6)
+++ src/tests/raii/.expect/dtor-early-exit-ERR2.txt	(revision e765794661ef77000b2d019da818d8d79d4bbce0)
@@ -1,3 +1,3 @@
-raii/dtor-early-exit.c:217:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
+raii/dtor-early-exit.c:214:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
   with target: L2
   with original target: L2
Index: src/tests/raii/dtor-early-exit.c
===================================================================
--- src/tests/raii/dtor-early-exit.c	(revision cfcf670b523fa98125d93269a28ba85a6d64f5b6)
+++ src/tests/raii/dtor-early-exit.c	(revision e765794661ef77000b2d019da818d8d79d4bbce0)
@@ -10,14 +10,11 @@
 // Created On       : Wed Aug 17 08:26:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 17 08:29:37 2016
-// Update Count     : 2
+// Last Modified On : Sat Aug 11 07:58:39 2018
+// Update Count     : 8
 //
 
 #include <fstream>
 #include <stdlib>
-extern "C" {
-#define false ((int)0)	// until stdbool.h works
-#define assert(cond) if (! (cond)) { sout | "Assertion failed: (" | #cond | ") at " __FILE__ | ":" | __LINE__ | endl; abort(); }
-}
+#include <assert.h>
 
 struct A {