Mercurial > hg > xemacs-beta

changeset 4749:dd29ed9c6962

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://sperber-guest@hg.debian.org//hg/xemacs/xemacs
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 16 Nov 2009 08:08:44 +0000
parents 294a86d29f99 (current diff) 27b09b4219b1 (diff)
children 91f85b19749f
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;