Kouhei Sutou
null+****@clear*****
Tue May 7 18:59:16 JST 2013
Kouhei Sutou 2013-05-07 18:59:16 +0900 (Tue, 07 May 2013) New Revision: 06b29ff6ce2397675c327e9d86060c2655931576 https://github.com/mroonga/mroonga/commit/06b29ff6ce2397675c327e9d86060c2655931576 Message: Remove old plugin name support Modified files: Makefile.am ha_mroonga.cpp Modified: Makefile.am (+0 -7) =================================================================== --- Makefile.am 2013-05-07 18:19:37 +0900 (71edc34) +++ Makefile.am 2013-05-07 18:59:16 +0900 (92ab81d) @@ -22,13 +22,6 @@ ha_mroonga_la_CFLAGS = $(dynamic_plugin_cflags) ha_mroonga_la_SOURCES = $(sources) ha_mroonga_la_LIBADD = $(libraries) -plugin_LTLIBRARIES += ha_groonga.la -ha_groonga_la_LDFLAGS = $(dynamic_plugin_ldflags) -ha_groonga_la_CXXFLAGS = $(dynamic_plugin_cxxflags) -DMRN_USE_DEPRECATED_NAME -ha_groonga_la_CFLAGS = $(dynamic_plugin_cflags) -DMRN_USE_DEPRECATED_NAME -ha_groonga_la_SOURCES = $(sources) -ha_groonga_la_LIBADD = $(libraries) - SUBDIRS = \ build \ lib \ Modified: ha_mroonga.cpp (+1 -5) =================================================================== --- ha_mroonga.cpp 2013-05-07 18:19:37 +0900 (a7a18a4) +++ ha_mroonga.cpp 2013-05-07 18:59:16 +0900 (0cf769d) @@ -107,11 +107,7 @@ extern MYSQL_PLUGIN_IMPORT pthread_mutex_t LOCK_open; #define MRN_STRINGIFY(macro_or_string) MRN_STRINGIFY_ARG(macro_or_string) #define MRN_STRINGIFY_ARG(contents) #contents -#ifdef MRN_USE_DEPRECATED_NAME -# define MRN_PLUGIN_NAME groonga -#else -# define MRN_PLUGIN_NAME mroonga -#endif +#define MRN_PLUGIN_NAME mroonga #define MRN_PLUGIN_NAME_STRING MRN_STRINGIFY(MRN_PLUGIN_NAME) #ifdef MRN_MARIADB_P -------------- next part -------------- HTML����������������������������...Download