commit: automatic merge

[Stephen J. Turnbull]

changeset:   4751:91f85b19749f
tag:         tip
parent:      4750:b5f21bb36684
parent:      4749:dd29ed9c6962
user:        Stephen J. Turnbull <stephen at xemacs.org>
date:        Tue Nov 17 23:45:42 2009 +0900
files:       src/ChangeLog
description:
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
@@ -7,6 +7,11 @@
 	Thanks to Aidan Kehoe for the diagnosis and suggestion.
 	(print_partial_compiled_pattern):
 	Avoid buffer overrun in case of /exactn/0.
+
+2009-11-15  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* mule-ccl.c (setup_ccl_program): 
+	Fix the union build, thank you Robert Delius Royar.
 
 2009-11-15  Aidan Kehoe  <kehoea at parhasard.net>
 
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;