null+****@clear*****
null+****@clear*****
2012年 2月 27日 (月) 14:00:40 JST
Kouhei Sutou 2012-02-27 14:00:40 +0900 (Mon, 27 Feb 2012)
New Revision: 377b3de0cbbc9bf26d38f795bb67e3385fc31958
Log:
[win32][test] suppress GRN_API redefined warnings
Modified files:
test/unit/lib/grn-assertions.c
test/unit/lib/grn-test-utils.c
test/unit/util/test-string.c
Modified: test/unit/lib/grn-assertions.c (+1 -1)
===================================================================
--- test/unit/lib/grn-assertions.c 2012-02-27 13:59:44 +0900 (9d277aa)
+++ test/unit/lib/grn-assertions.c 2012-02-27 14:00:40 +0900 (1f9d52f)
@@ -18,13 +18,13 @@
#include <cutter/cut-helper.h>
#include <gcutter.h>
-#include "grn-assertions.h"
#include <groonga_in.h>
#include <db.h>
#include <util.h>
#include <str.h>
+#include "grn-assertions.h"
void
grn_test_assert_helper(grn_rc rc, const gchar *expression)
Modified: test/unit/lib/grn-test-utils.c (+2 -1)
===================================================================
--- test/unit/lib/grn-test-utils.c 2012-02-27 13:59:44 +0900 (21ea956)
+++ test/unit/lib/grn-test-utils.c 2012-02-27 14:00:40 +0900 (5f6560d)
@@ -16,10 +16,11 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "grn-assertions.h"
#include <str.h>
#include <db.h>
+#include "grn-assertions.h"
+
const gchar *
grn_rc_to_string(grn_rc rc)
{
Modified: test/unit/util/test-string.c (+1 -1)
===================================================================
--- test/unit/util/test-string.c 2012-02-27 13:59:44 +0900 (2417060)
+++ test/unit/util/test-string.c 2012-02-27 14:00:40 +0900 (ba5a4fc)
@@ -16,9 +16,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <groonga_in.h>
#include <groonga.h>
-#include <groonga_in.h>
#include <stdlib.h>
#include <str.h>