# HG changeset patch
# User Stephen J. Turnbull <stephen@xemacs.org>
# Date 1258469142 -32400
# Node ID 91f85b19749f7b4d6b9c626c053504f8f1603e67
# Parent  b5f21bb366841f8a0ccb1e6f378ea6dc3d30cd0e# Parent  dd29ed9c69624255f7457bec501094705f7b4777
automatic merge

diff -r b5f21bb36684 -r 91f85b19749f src/ChangeLog
--- a/src/ChangeLog	Tue Nov 17 23:41:39 2009 +0900
+++ b/src/ChangeLog	Tue Nov 17 23:45:42 2009 +0900
@@ -10,6 +10,11 @@
 
 2009-11-15  Aidan Kehoe  <kehoea@parhasard.net>
 
+	* mule-ccl.c (setup_ccl_program): 
+	Fix the union build, thank you Robert Delius Royar.
+
+2009-11-15  Aidan Kehoe  <kehoea@parhasard.net>
+
 	* mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always
 	have a symbol in this macro.
 	(setup_ccl_program): Ensure we're not allocating unreachable
diff -r b5f21bb36684 -r 91f85b19749f src/mule-ccl.c
--- a/src/mule-ccl.c	Tue Nov 17 23:41:39 2009 +0900
+++ b/src/mule-ccl.c	Tue Nov 17 23:45:42 2009 +0900
@@ -2159,7 +2159,7 @@
         {
           /* Make sure we're not allocating unreachable memory in this
              function: */
-          assert (ccl_prog == new_prog);
+          assert (EQ (ccl_prog, new_prog));
         }
 
       ccl_prog = new_prog;