commands.cc, parse.h, parse.cc, instance_options.cc:

  Prefix enum symbols LOG_* with IM_, not to clash with system headers

server-tools/instance-manager/commands.cc

@@ -573,9 +573,9 @@ int Show_instance_log_files::execute(struct st_net *net, ulong connection_id)
       const char *value;
     } logs[]=
     {
-      {"ERROR LOG", instance->options.logs[LOG_ERROR]},
-      {"GENERAL LOG", instance->options.logs[LOG_GENERAL]},
-      {"SLOW LOG", instance->options.logs[LOG_SLOW]},
+      {"ERROR LOG", instance->options.logs[IM_LOG_ERROR]},
+      {"GENERAL LOG", instance->options.logs[IM_LOG_GENERAL]},
+      {"SLOW LOG", instance->options.logs[IM_LOG_SLOW]},
       {NULL, NULL}
     };
     struct log_files_st *log_files;

server-tools/instance-manager/instance_options.cc

@@ -111,9 +111,9 @@ int Instance_options::fill_log_options()
     const char *default_suffix;
   } logs_st[]=
   {
-    {"--log-error", 11, &(logs[LOG_ERROR]), ".err"},
-    {"--log", 5, &(logs[LOG_GENERAL]), ".log"},
-    {"--log-slow-queries", 18, &(logs[LOG_SLOW]), "-slow.log"},
+    {"--log-error", 11, &(logs[IM_LOG_ERROR]), ".err"},
+    {"--log", 5, &(logs[IM_LOG_GENERAL]), ".log"},
+    {"--log-slow-queries", 18, &(logs[IM_LOG_SLOW]), "-slow.log"},
     {NULL, 0, NULL, NULL}
   };
   struct log_files_st *log_files;

server-tools/instance-manager/parse.cc

@@ -262,13 +262,13 @@ Command *parse_command(Command_factory *factory, const char *text)
             /* define a log type */
             switch (tok3) {
             case TOK_ERROR:
-              log_type= LOG_ERROR;
+              log_type= IM_LOG_ERROR;
               break;
             case TOK_GENERAL:
-              log_type= LOG_GENERAL;
+              log_type= IM_LOG_GENERAL;
               break;
             case TOK_SLOW:
-              log_type= LOG_SLOW;
+              log_type= IM_LOG_SLOW;
               break;
             default:
               goto syntax_error;

server-tools/instance-manager/parse.h

@@ -24,9 +24,9 @@ class Command_factory;
 
 enum Log_type
 {
-  LOG_ERROR= 0,
-  LOG_GENERAL,
-  LOG_SLOW
+  IM_LOG_ERROR= 0,
+  IM_LOG_GENERAL,
+  IM_LOG_SLOW
 };
 
 Command *parse_command(Command_factory *factory, const char  *text);