[Groonga-commit] groonga/groonga at 286d030 [master] Remove needless "ifdef WITH_MRUBY"

Back to archive index

Kouhei Sutou null+****@clear*****
Wed Feb 4 13:05:17 JST 2015


Kouhei Sutou	2015-02-04 13:05:17 +0900 (Wed, 04 Feb 2015)

  New Revision: 286d03018af20472d8176f3372220f05211bff53
  https://github.com/groonga/groonga/commit/286d03018af20472d8176f3372220f05211bff53

  Message:
    Remove needless "ifdef WITH_MRUBY"

  Modified files:
    lib/ctx_impl_mrb.c
    lib/mrb/mrb_command.h
    lib/mrb/mrb_converter.h
    lib/mrb/mrb_ctx.h

  Modified: lib/ctx_impl_mrb.c (+4 -3)
===================================================================
--- lib/ctx_impl_mrb.c    2015-02-03 23:18:00 +0900 (c6d4eea)
+++ lib/ctx_impl_mrb.c    2015-02-04 13:05:17 +0900 (2381280)
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2013-2014 Brazil
+  Copyright(C) 2013-2015 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -16,10 +16,12 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include "grn_ctx_impl.h"
+
+#ifdef GRN_WITH_MRUBY
 #include <string.h>
 
 #include "grn_ctx_impl_mrb.h"
-#include "grn_ctx_impl.h"
 
 #include "grn_mrb.h"
 #include "mrb/mrb_error.h"
@@ -49,7 +51,6 @@
 #include "mrb/mrb_table_cursor.h"
 #include "mrb/mrb_table_cursor_flags.h"
 
-#ifdef GRN_WITH_MRUBY
 # include <mruby/array.h>
 # include <mruby/variable.h>
 #endif

  Modified: lib/mrb/mrb_command.h (+0 -2)
===================================================================
--- lib/mrb/mrb_command.h    2015-02-03 23:18:00 +0900 (b5098fd)
+++ lib/mrb/mrb_command.h    2015-02-04 13:05:17 +0900 (2b899df)
@@ -27,9 +27,7 @@ extern "C" {
 
 void grn_mrb_command_init(grn_ctx *ctx);
 
-#ifdef GRN_WITH_MRUBY
 mrb_value grn_mrb_command_instantiate(grn_ctx *ctx, grn_obj *command);
-#endif
 
 #ifdef __cplusplus
 }

  Modified: lib/mrb/mrb_converter.h (+0 -2)
===================================================================
--- lib/mrb/mrb_converter.h    2015-02-03 23:18:00 +0900 (422ecb6)
+++ lib/mrb/mrb_converter.h    2015-02-04 13:05:17 +0900 (e97f8c8)
@@ -25,10 +25,8 @@
 extern "C" {
 #endif
 
-#ifdef GRN_WITH_MRUBY
 struct RClass *grn_mrb_class_from_grn_obj(mrb_state *mrb, grn_obj *object);
 mrb_value      grn_mrb_value_from_grn_obj(mrb_state *mrb, grn_obj *object);
-#endif
 
 #ifdef __cplusplus
 }

  Modified: lib/mrb/mrb_ctx.h (+0 -2)
===================================================================
--- lib/mrb/mrb_ctx.h    2015-02-03 23:18:00 +0900 (95df81d)
+++ lib/mrb/mrb_ctx.h    2015-02-04 13:05:17 +0900 (aa527bf)
@@ -26,9 +26,7 @@ extern "C" {
 #endif
 
 void grn_mrb_ctx_init(grn_ctx *ctx);
-#ifdef GRN_WITH_MRUBY
 void grn_mrb_ctx_check(mrb_state *mrb);
-#endif
 
 #ifdef __cplusplus
 }
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index