Kouhei Sutou 2018-11-22 17:50:15 +0900 (Thu, 22 Nov 2018) Revision: bc4604f4bd513482a7e56694b9c4485d71dd4f3d https://github.com/groonga/groonga/commit/bc4604f4bd513482a7e56694b9c4485d71dd4f3d Message: Unify common code Modified files: lib/ctx.c lib/expr_executor.c lib/grn.h lib/operator.c Modified: lib/ctx.c (+0 -4) =================================================================== --- lib/ctx.c 2018-11-21 13:04:46 +0900 (fd39fdb81) +++ lib/ctx.c 2018-11-22 17:50:15 +0900 (23bd743ee) @@ -40,10 +40,6 @@ #include <stdarg.h> #include <time.h> -#ifdef GRN_WITH_ONIGMO -# define GRN_SUPPORT_REGEXP -#endif /* GRN_WITH_ONIGMO */ - #ifdef GRN_SUPPORT_REGEXP # include <onigmo.h> #endif /* GRN_SUPPORT_REGEXP */ Modified: lib/expr_executor.c (+0 -4) =================================================================== --- lib/expr_executor.c 2018-11-21 13:04:46 +0900 (355c8de19) +++ lib/expr_executor.c 2018-11-22 17:50:15 +0900 (c0e84135d) @@ -23,10 +23,6 @@ #include "grn_expr_executor.h" #include "grn_geo.h" -#ifdef GRN_WITH_ONIGMO -# define GRN_SUPPORT_REGEXP -#endif - #ifdef GRN_SUPPORT_REGEXP # include "grn_normalizer.h" # include <onigmo.h> Modified: lib/grn.h (+4 -0) =================================================================== --- lib/grn.h 2018-11-21 13:04:46 +0900 (261140d13) +++ lib/grn.h 2018-11-22 17:50:15 +0900 (1c6fd0b1c) @@ -679,6 +679,10 @@ grn_str_greater(const uint8_t *ap, uint32_t as, const uint8_t *bp, uint32_t bs) #define GRN_NEXT_ADDR(p) (((byte *)(p)) + sizeof(*(p))) +#ifdef GRN_WITH_ONIGMO +# define GRN_SUPPORT_REGEXP +#endif /* GRN_WITH_ONIGMO */ + GRN_API void grn_sleep(uint32_t seconds); GRN_API void grn_nanosleep(uint64_t nanoseconds); Modified: lib/operator.c (+0 -4) =================================================================== --- lib/operator.c 2018-11-21 13:04:46 +0900 (72369d260) +++ lib/operator.c 2018-11-22 17:50:15 +0900 (e11eb0840) @@ -25,10 +25,6 @@ #include <math.h> #include <float.h> -#ifdef GRN_WITH_ONIGMO -# define GRN_SUPPORT_REGEXP -#endif - #ifdef GRN_SUPPORT_REGEXP # include <onigmo.h> #endif -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20181122/95bb7b22/attachment-0001.html>
