make regex and asciidoc work on Darwin without hacking

[libucw.git] / images / sig-cmp.c

diff --git a/images/sig-cmp.c b/images/sig-cmp.c
index b420f0673ce95d39fb9132be2a7508947d81eaab..71beecf261d490178fb8993d37812de4d31df1b6 100644 (file)
--- a/images/sig-cmp.c
+++ b/images/sig-cmp.c
@@ -9,8 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/math.h"
+#include "ucw/lib.h"
 #include "images/math.h"
 #include "images/images.h"
 #include "images/signature.h"
@@ -19,9 +18,7 @@
 
 #define ASORT_PREFIX(x) image_signatures_dist_integrated_##x
 #define ASORT_KEY_TYPE uns
-#define ASORT_ELT(i) items[i]
-#define ASORT_EXTRA_ARGS , uns *items
-#include "lib/arraysort.h"
+#include "ucw/sorter/array-simple.h"
 
 #define EXPLAIN
 #include "images/sig-cmp-gen.h"