Merge branch 'master' of ssh://kylheku.com/git/txr

Conflicts:
	ChangeLog

4 files changed, 22 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 389134a5..817b7df1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-10-30  Kaz Kylheku  <kaz@kylheku.com>
+
+	* lib.c (string_lt): Bugfix: wcscmp returns some value less than zero,
+	not specifically -1.
+
+2012-10-30  Kaz Kylheku  <kaz@kylheku.com>
+
+	* mpi-patches/config-types: Include the header as "config.h"
+	rather than "../config.h" because the dependency generation script
+	checks for this as a special case and treats it relative to the
+	build directory.
+
+	* dep.mk: Regenerated.
+
 2012-10-01  Kaz Kylheku  <kaz@kylheku.com>
 
 	* arith.c (bignum_from_long): New function.
diff --git a/dep.mk b/dep.mk
index e0ca3429..a43c912d 100644
--- a/dep.mk
+++ b/dep.mk
@@ -3,7 +3,7 @@
 ./y.tab.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./utf8.h $(top_srcdir)/./match.h $(top_srcdir)/./hash.h $(top_srcdir)/./eval.h $(top_srcdir)/./parser.h
 ./match.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./txr.h $(top_srcdir)/./utf8.h $(top_srcdir)/./filter.h $(top_srcdir)/./hash.h $(top_srcdir)/./debug.h $(top_srcdir)/./eval.h $(top_srcdir)/./match.h
 ./lib.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./rand.h $(top_srcdir)/./hash.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./utf8.h $(top_srcdir)/./filter.h $(top_srcdir)/./eval.h $(top_srcdir)/./regex.h
-./regex.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./txr.h
+./regex.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./txr.h $(top_srcdir)/./gc.h
 ./gc.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h $(top_srcdir)/./txr.h $(top_srcdir)/./eval.h $(top_srcdir)/./gc.h
 ./unwind.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./stream.h $(top_srcdir)/./txr.h $(top_srcdir)/./unwind.h
 ./stream.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./utf8.h
@@ -13,6 +13,6 @@
 ./filter.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./hash.h $(top_srcdir)/./unwind.h $(top_srcdir)/./match.h $(top_srcdir)/./filter.h $(top_srcdir)/./gc.h $(top_srcdir)/./stream.h
 ./eval.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./hash.h $(top_srcdir)/./debug.h $(top_srcdir)/./match.h $(top_srcdir)/./rand.h $(top_srcdir)/./filter.h $(top_srcdir)/./txr.h $(top_srcdir)/./eval.h
 ./rand.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./unwind.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./rand.h
-mpi-1.8.6/mpi.o: $(top_srcdir)/mpi-1.8.6/../config.h $(top_srcdir)/mpi-1.8.6/mpi.h $(top_srcdir)/mpi-1.8.6/logtab.h
-mpi-1.8.6/mplogic.o: $(top_srcdir)/mpi-1.8.6/../config.h $(top_srcdir)/mpi-1.8.6/mplogic.h
+mpi-1.8.6/mpi.o: config.h $(top_srcdir)/mpi-1.8.6/mpi.h $(top_srcdir)/mpi-1.8.6/logtab.h
+mpi-1.8.6/mplogic.o: config.h $(top_srcdir)/mpi-1.8.6/mplogic.h
 ./debug.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./debug.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./txr.h
diff --git a/lib.c b/lib.c
index fcbcae15..b2c2f0d5 100644
--- a/lib.c
+++ b/lib.c
@@ -2092,8 +2092,7 @@ val trim_str(val str)
 
 val string_lt(val astr, val bstr)
 {
-  int cmp = wcscmp(c_str(astr), c_str(bstr));
-  return cmp == -1 ? t : nil;
+  return wcscmp(c_str(astr), c_str(bstr)) < 0 ? t : nil;
 }
 
 val int_str(val str, val base)
diff --git a/mpi-patches/config-types b/mpi-patches/config-types
index a99e94c4..a2cb137b 100644
--- a/mpi-patches/config-types
+++ b/mpi-patches/config-types
@@ -80,7 +80,7 @@ Index: mpi-1.8.6/mpi.c
      $Id: mpi.c,v 1.1 2004/02/08 04:29:29 sting Exp $
   */
  
-+#include "../config.h"
++#include "config.h"
  #include "mpi.h"
  #include <stdlib.h>
  #include <string.h>
@@ -92,7 +92,7 @@ Index: mpi-1.8.6/mplogic.c
      $Id: mplogic.c,v 1.1 2004/02/08 04:29:29 sting Exp $
   */
  
-+#include "../config.h"
++#include "config.h"
  #include "mplogic.h"
  #include <stdlib.h>
  
@@ -104,7 +104,7 @@ Index: mpi-1.8.6/mpprime.c
      $Id: mpprime.c,v 1.1 2004/02/08 04:29:29 sting Exp $
   */
  
-+#include "../config.h"
++#include "config.h"
  #include "mpprime.h"
  #include <stdlib.h>
  
@@ -116,7 +116,7 @@ Index: mpi-1.8.6/mprsa.c
    $Id: mprsa.c,v 1.1 2004/02/08 04:29:29 sting Exp $
   */
  
-+#include "../config.h"
++#include "config.h"
  #include "mprsa.h"
  #include <stdlib.h>
  #include <string.h>