Enable grn_ts by default

groonga · Oct 26, 2015 · 2e7ad2b · 2e7ad2b
1 parent 16e74cc
commit 2e7ad2b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/lib/grn_ts.h b/lib/grn_ts.h
@@ -19,8 +19,6 @@
 #ifndef GRN_TS_H
 #define GRN_TS_H
 
-#ifdef GRN_WITH_TS
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -393,6 +391,4 @@ grn_rc grn_ts_select(grn_ctx *ctx, grn_obj *table,
 }
 #endif
 
-#endif /* GRN_WITH_TS */
-
 #endif /* GRN_TS_H */
diff --git a/lib/proc.c b/lib/proc.c
@@ -26,9 +26,7 @@
 #include "grn_token_cursor.h"
 #include "grn_expr.h"
 
-#ifdef GRN_WITH_TS
-# include "grn_ts.h"
-#endif /* GRN_WITH_TS */
+#include "grn_ts.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -1013,7 +1011,6 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len,
   }
   if ((table_ = grn_ctx_get(ctx, table, table_len))) {
     // match_columns_ = grn_obj_column(ctx, table_, match_columns, match_columns_len);
-#ifdef GRN_WITH_TS
     if (filter_len && (filter[0] == '?') &&
         (ctx->impl->output_type == GRN_CONTENT_JSON)) {
       ctx->rc = grn_ts_select(ctx, table_, filter + 1, filter_len - 1,
@@ -1025,7 +1022,6 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len,
       }
       goto exit;
     }
-#endif /* GRN_WITH_TS */
     if (query_len || filter_len) {
       grn_obj *v;
       GRN_EXPR_CREATE_FOR_QUERY(ctx, table_, cond, v);

diff --git a/lib/ts.c b/lib/ts.c
@@ -18,8 +18,6 @@
 
 /* TS is an acronym for "Turbo Selector". */
 
-#ifdef GRN_WITH_TS
-
 #include "grn_ts.h"
 
 #include <ctype.h>
@@ -7983,5 +7981,3 @@ grn_ts_select(grn_ctx *ctx, grn_obj *table,
   }
   return rc;
 }
-
-#endif /* GRN_WITH_TS */