null+****@clear*****
null+****@clear*****
2011年 6月 9日 (木) 16:01:41 JST
Kouhei Sutou 2011-06-09 07:01:41 +0000 (Thu, 09 Jun 2011)
New Revision: db30f7af0a133d22ff88e66a597f07a5931fea13
Log:
mrnsys -> mrn_sys.
Modified files:
Makefile.am
ha_mroonga.h
mrn_table.cc
test/unit/Makefile.am
Renamed files:
mrn_sys.c
(from mrnsys.c)
mrn_sys.h
(from mrnsys.h)
test/unit/test_mrn_sys.c
(from test/unit/test_mrnsys.c)
Modified: Makefile.am (+3 -3)
===================================================================
--- Makefile.am 2011-06-09 06:40:02 +0000 (528f505)
+++ Makefile.am 2011-06-09 07:01:41 +0000 (f372440)
@@ -3,19 +3,19 @@ AUTOMAKE_OPTIONS = 1.9.7
AM_CPPFLAGS = $(MYSQL_INC) $(GROONGA_CFLAGS) $(MECAB_INCLUDES) $(MYSQL_VERSION_CFLAGS)
ACLOCAL_AMFLAGS = $$ACLOCAL_ARGS
-noinst_HEADERS = mrnsys.h ha_mroonga.h mrn_table.h mrn_err.h
+noinst_HEADERS = mrn_sys.h ha_mroonga.h mrn_table.h mrn_err.h
plugin_LTLIBRARIES = ha_groonga.la
ha_groonga_la_LDFLAGS = -module $(GROONGA_LIBS) $(MECAB_LIBS)
ha_groonga_la_CXXFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_groonga_la_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_groonga_la_SOURCES = ha_mroonga.cc mrnsys.c mrn_table.cc
+ha_groonga_la_SOURCES = ha_mroonga.cc mrn_sys.c mrn_table.cc
plugin_LIBRARIES = libgroonga_storage_engine.a
libgroonga_storage_engine_a_LDFLANGS = $(GROONGA_LIBS) $(MECAB_LIBS)
libgroonga_storage_engine_a_CXXFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS)
libgroonga_storage_engine_a_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS)
-libgroonga_storage_engine_a_SOURCES = ha_mroonga.cc mrnsys.c mrn_table.cc
+libgroonga_storage_engine_a_SOURCES = ha_mroonga.cc mrn_sys.c mrn_table.cc
SUBDIRS = test apt rpm yum doc
Modified: ha_mroonga.h (+1 -1)
===================================================================
--- ha_mroonga.h 2011-06-09 06:40:02 +0000 (6fdc89d)
+++ ha_mroonga.h 2011-06-09 07:01:41 +0000 (9ba8786)
@@ -30,7 +30,7 @@ extern "C" {
#endif
#include <groonga.h>
-#include "mrnsys.h"
+#include "mrn_sys.h"
/* structs */
struct st_mrn_statuses
Renamed: mrn_sys.c (+1 -1) 99%
===================================================================
--- mrnsys.c 2011-06-09 06:40:02 +0000 (2b29aa2)
+++ mrn_sys.c 2011-06-09 07:01:41 +0000 (3a7e3af)
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "mrnsys.h"
+#include "mrn_sys.h"
#include "config.h"
int mrn_hash_put(grn_ctx *ctx, grn_hash *hash, const char *key, void *value)
Renamed: mrn_sys.h (+0 -0) 100%
===================================================================
Modified: mrn_table.cc (+1 -1)
===================================================================
--- mrn_table.cc 2011-06-09 06:40:02 +0000 (d53a282)
+++ mrn_table.cc 2011-06-09 07:01:41 +0000 (d702619)
@@ -29,7 +29,7 @@
#include "sql_base.h"
#endif
#include "mrn_err.h"
-#include "mrnsys.h"
+#include "mrn_sys.h"
#include "mrn_table.h"
#define MRN_DEFAULT_STR "DEFAULT"
Modified: test/unit/Makefile.am (+3 -3)
===================================================================
--- test/unit/Makefile.am 2011-06-09 06:40:02 +0000 (9d678e0)
+++ test/unit/Makefile.am 2011-06-09 07:01:41 +0000 (e176064)
@@ -1,5 +1,5 @@
if WITH_CUTTER
-noinst_LTLIBRARIES = test_mrnsys.la
+noinst_LTLIBRARIES = test_mrn_sys.la
endif
AM_CPPFLAGS = $(GROONGA_CFLAGS) $(MECAB_INCLUDES) $(CUTTER_CFLAGS) $(GCUTTER_CFLAGS)
@@ -12,6 +12,6 @@ LDFLAGS = -module -rpath $(libdir) -avoid-version -no-undefined
LIBS = $(CUTTER_LIBS) $(GROONGA_LIBS) $(MECAB_LIBS)
-EXTERNAL_SRC = ../../mrnsys.c
+EXTERNAL_SRC = ../../mrn_sys.c
-test_mrnsys_la_SOURCES = $(EXTERNAL_SRC) test_mrnsys.c
+test_mrn_sys_la_SOURCES = $(EXTERNAL_SRC) test_mrn_sys.c
Renamed: test/unit/test_mrn_sys.c (+1 -1) 99%
===================================================================
--- test/unit/test_mrnsys.c 2011-06-09 06:40:02 +0000 (ac2de16)
+++ test/unit/test_mrn_sys.c 2011-06-09 07:01:41 +0000 (5e0ac4f)
@@ -18,7 +18,7 @@
#include <string.h>
#include <gcutter.h>
#include <glib/gstdio.h>
-#include "mrnsys.h"
+#include "mrn_sys.h"
grn_ctx *ctx;
grn_obj *db;