windows: stop to use ifdef in var arguments

groonga · Oct 18, 2015 · a013813 · a013813
1 parent 3b11ce1
commit a013813
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/plugins/tokenizers/mecab.c b/plugins/tokenizers/mecab.c
@@ -304,19 +304,19 @@ mecab_create(grn_ctx *ctx)
   mecab = mecab_new(argc, (char **)argv);
 
   if (!mecab) {
-    GRN_PLUGIN_ERROR(ctx, GRN_TOKENIZER_ERROR,
-                     "[tokenizer][mecab] "
-                     "failed to create mecab_t: mecab_new("
-                     "\"%s\", \"%s\""
-#ifdef GRN_WITH_BUNDLED_MECAB
-                     ", \"%s\", \"%s\""
-#endif /* GRN_WITH_BUNDLED_MECAB */
-                     "): %s",
-                     argv[0], argv[1],
 #ifdef GRN_WITH_BUNDLED_MECAB
-                     argv[2], argv[3],
+    GRN_PLUGIN_ERROR(ctx, GRN_TOKENIZER_ERROR,
+                     "[tokenizer][mecab] failed to create mecab_t: %s: "
+                     "mecab_new(\"%s\", \"%s\", \"%s\", \"%s\")"
+                     mecab_global_error_message(),
+                     argv[0], argv[1], argv[2], argv[3]);
+#else /* GRN_WITH_BUNDLED_MECAB */
+    GRN_PLUGIN_ERROR(ctx, GRN_TOKENIZER_ERROR,
+                     "[tokenizer][mecab] failed to create mecab_t: %s: "
+                     "mecab_new(\"%s\", \"%s\")",
+                     mecab_global_error_message(),
+                     argv[0], argv[1]);
 #endif /* GRN_WITH_BUNDLED_MECAB */
-                     mecab_global_error_message());
   }
 
   return mecab;