# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1258358924 0
# Node ID dd29ed9c69624255f7457bec501094705f7b4777
# Parent  294a86d29f996e8c0812f41795c99cdfeb8638db# Parent  27b09b4219b14b6198992c520b9d9f68ea66ea8b
Automated merge with ssh://sperber-guest@hg.debian.org//hg/xemacs/xemacs

diff -r 294a86d29f99 -r dd29ed9c6962 src/ChangeLog
--- a/src/ChangeLog	Mon Nov 16 12:00:38 2009 +0900
+++ b/src/ChangeLog	Mon Nov 16 08:08:44 2009 +0000
@@ -1,3 +1,8 @@
+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
diff -r 294a86d29f99 -r dd29ed9c6962 src/mule-ccl.c
--- a/src/mule-ccl.c	Mon Nov 16 12:00:38 2009 +0900
+++ b/src/mule-ccl.c	Mon Nov 16 08:08:44 2009 +0000
@@ -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;