# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1391992190 18000
# Node ID fca98a6cbe23bbd4f9fccd4250cfbc6ef48397d0
# Parent  b15a4c2cb542d36ef3bdaa99c6192755c9a79e1f# Parent  126d24ef66786646084a09559f8adc6137f91a08
Merge

diff -r b15a4c2cb542 -r fca98a6cbe23 src/c/Makefile.am
--- a/src/c/Makefile.am	Sun Feb 09 19:29:36 2014 -0500
+++ b/src/c/Makefile.am	Sun Feb 09 19:29:50 2014 -0500
@@ -7,7 +7,7 @@
 liburweb_static_la_SOURCES = static.c
 
 AM_CPPFLAGS = -I$(srcdir)/../../include/urweb $(OPENSSL_INCLUDES)
-AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-format-security -Wno-deprecated-declarations $(PTHREAD_CFLAGS)
+AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-format-security -Wno-deprecated-declarations -U_FORTIFY_SOURCE $(PTHREAD_CFLAGS)
 liburweb_la_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS)
 liburweb_la_LIBADD = $(PTHREAD_LIBS) -lm $(OPENSSL_LIBS)
 liburweb_http_la_LIBADD = liburweb.la
diff -r b15a4c2cb542 -r fca98a6cbe23 src/elaborate.sml
--- a/src/elaborate.sml	Sun Feb 09 19:29:36 2014 -0500
+++ b/src/elaborate.sml	Sun Feb 09 19:29:50 2014 -0500
@@ -873,8 +873,9 @@
                                              | _ => false}
 
          val (others1, others2) = eatMatching (fn (c1, c2) =>
-                                                  not (hasUnifs c1 andalso hasUnifs c2)
-                                                  andalso consEq env loc (c1, c2)) (#others s1, #others s2)
+                                                  c1 = c2
+                                                  orelse (not (hasUnifs c1 andalso hasUnifs c2)
+                                                          andalso consEq env loc (c1, c2))) (#others s1, #others s2)
          (*val () = eprefaces "Summaries3" [("#1", p_summary env {fields = fs1, unifs = unifs1, others = others1}),
                                           ("#2", p_summary env {fields = fs2, unifs = unifs2, others = others2})]*)