Kouhei Sutou
null+****@clear*****
Sat May 16 16:49:07 JST 2015
Kouhei Sutou 2015-05-16 16:49:07 +0900 (Sat, 16 May 2015) New Revision: ae7472a6961c56bc8fdb5b4404ea6409809f355a https://github.com/mroonga/mroonga/commit/ae7472a6961c56bc8fdb5b4404ea6409809f355a Message: Include MySQL related header files before Groonga Because MariaDB checks header file include order. Modified files: lib/mrn_encoding.hpp lib/mrn_field_normalizer.hpp Modified: lib/mrn_encoding.hpp (+3 -3) =================================================================== --- lib/mrn_encoding.hpp 2015-05-15 23:16:59 +0900 (b29b44d) +++ lib/mrn_encoding.hpp 2015-05-16 16:49:07 +0900 (9c3a65d) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Kouhei Sutou <kou �� clear-code.com> + Copyright(C) 2013-2015 Kouhei Sutou <kou �� clear-code.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,11 @@ #ifndef MRN_ENCODING_HPP_ #define MRN_ENCODING_HPP_ -#include <groonga.h> - #include <mrn_mysql.h> #include <mrn_mysql_compat.h> +#include <groonga.h> + namespace mrn { namespace encoding { void init(void); Modified: lib/mrn_field_normalizer.hpp (+3 -3) =================================================================== --- lib/mrn_field_normalizer.hpp 2015-05-15 23:16:59 +0900 (5fd8974) +++ lib/mrn_field_normalizer.hpp 2015-05-16 16:49:07 +0900 (3a85569) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Kouhei Sutou <kou �� clear-code.com> + Copyright(C) 2013-2015 Kouhei Sutou <kou �� clear-code.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,11 @@ #ifndef MRN_FIELD_NORMALIZER_HPP_ #define MRN_FIELD_NORMALIZER_HPP_ -#include <groonga.h> - #include <mrn_mysql.h> #include <mrn_mysql_compat.h> +#include <groonga.h> + namespace mrn { class FieldNormalizer { public: -------------- next part -------------- HTML����������������������������... 下載