[Groonga-mysql-commit] mroonga/mroonga at c48a180 [master] mariadb10.1: include MySQL related header files before Groonga

Back to archive index

Kouhei Sutou null+****@clear*****
Sat May 16 17:58:08 JST 2015


Kouhei Sutou	2015-05-16 17:58:08 +0900 (Sat, 16 May 2015)

  New Revision: c48a180b500f12c84d668f2fc7cc4b9f80693ec7
  https://github.com/mroonga/mroonga/commit/c48a180b500f12c84d668f2fc7cc4b9f80693ec7

  Message:
    mariadb10.1: include MySQL related header files before Groonga
    
    Because MariaDB checks header file include order.

  Modified files:
    lib/mrn_condition_converter.hpp
    lib/mrn_time_converter.hpp

  Modified: lib/mrn_condition_converter.hpp (+2 -1)
===================================================================
--- lib/mrn_condition_converter.hpp    2015-05-16 17:57:00 +0900 (bb85f5c)
+++ lib/mrn_condition_converter.hpp    2015-05-16 17:58:08 +0900 (3a7fbd0)
@@ -20,11 +20,12 @@
 #ifndef MRN_CONDITION_CONVERTER_HPP_
 #define MRN_CONDITION_CONVERTER_HPP_
 
-#include <groonga.h>
 #include <mrn_mysql_compat.h>
 
 #include <item_cmpfunc.h>
 
+#include <groonga.h>
+
 namespace mrn {
   class ConditionConverter {
   public:

  Modified: lib/mrn_time_converter.hpp (+2 -1)
===================================================================
--- lib/mrn_time_converter.hpp    2015-05-16 17:57:00 +0900 (e61ed8f)
+++ lib/mrn_time_converter.hpp    2015-05-16 17:58:08 +0900 (9d297f9)
@@ -21,9 +21,10 @@
 #ifndef MRN_TIME_CONVERTER_HPP_
 #define MRN_TIME_CONVERTER_HPP_
 
-#include <groonga.h>
 #include <mrn_mysql_compat.h>
 
+#include <groonga.h>
+
 namespace mrn {
   class TimeConverter {
   public:
-------------- next part --------------
HTML����������������������������...
下載 



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