ff-varints: Fixed really silly bug in handling fastbufs.

[libucw.git] / ucw / sorter / sorter.h

diff --git a/ucw/sorter/sorter.h b/ucw/sorter/sorter.h
index 568ced03ea4a79d04a8d4944bf0ad9a794e2c272..766fb709f05b858258ccc940b6683f5c9419bf3c 100644 (file)
--- a/ucw/sorter/sorter.h
+++ b/ucw/sorter/sorter.h
@@ -114,8 +114,9 @@
  *  undef'd.
  */
 
  *  undef'd.
  */
 

-#include "ucw/sorter/common.h"
-#include "ucw/fastbuf.h"
+#include <ucw/sorter/common.h>
+#include <ucw/fastbuf.h>
+#include <ucw/time.h>

 
 #include <fcntl.h>
 
 
 #include <fcntl.h>
 


@@ -205,17 +206,17 @@ static inline void P(copy_merged)(P(key) **keys, struct fastbuf **data UNUSED, u
 
 #if defined(SORT_HASH_BITS) || defined(SORT_INT)
 #define SORT_INTERNAL_RADIX
 
 #if defined(SORT_HASH_BITS) || defined(SORT_INT)
 #define SORT_INTERNAL_RADIX

-#include "ucw/sorter/s-radix.h"
+#include <ucw/sorter/s-radix.h>

 #endif
 
 #if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY_WORKSPACE)
 #endif
 
 #if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY_WORKSPACE)

-#include "ucw/sorter/s-internal.h"
+#include <ucw/sorter/s-internal.h>

 #else
 #else

-#include "ucw/sorter/s-fixint.h"
+#include <ucw/sorter/s-fixint.h>

 #endif
 
 #endif
 

-#include "ucw/sorter/s-twoway.h"
-#include "ucw/sorter/s-multiway.h"
+#include <ucw/sorter/s-twoway.h>
+#include <ucw/sorter/s-multiway.h>

 
 static struct fastbuf *P(sort)(
 #ifdef SORT_INPUT_FILE
 
 static struct fastbuf *P(sort)(
 #ifdef SORT_INPUT_FILE