From adf20e3512f0eb4a71b0cbe2d50ad95a5624a359 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Mon, 29 Jan 2007 19:36:48 +0100
Subject: [PATCH] Bug#22579 use --warning-mode=pedantic and -std=c89 flags when
 compiling with gcc  - Reorganize include file order to avoid problem with gcc
 2.95.3  - Compiler is confused by forward class declarations

---
 server-tools/instance-manager/command.cc  | 3 +--
 server-tools/instance-manager/instance.cc | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server-tools/instance-manager/command.cc b/server-tools/instance-manager/command.cc
index bbaa34b0823..ba84285ead2 100644
--- a/server-tools/instance-manager/command.cc
+++ b/server-tools/instance-manager/command.cc
@@ -17,9 +17,8 @@
 #pragma implementation
 #endif
 
-#include "command.h"
 #include "manager.h"
-
+#include "command.h"
 
 Command::Command()
   :guardian(Manager::get_guardian()),
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc
index f1166fdd804..2c94689c664 100644
--- a/server-tools/instance-manager/instance.cc
+++ b/server-tools/instance-manager/instance.cc
@@ -17,7 +17,6 @@
 #pragma implementation
 #endif
 
-#include "instance.h"
 
 #include <mysql.h>
 
@@ -26,8 +25,9 @@
 #include <sys/wait.h>
 #endif
 
-#include "guardian.h"
 #include "manager.h"
+#include "guardian.h"
+#include "instance.h"
 #include "log.h"
 #include "mysql_manager_error.h"
 #include "portability.h"
@@ -35,6 +35,7 @@
 #include "thread_registry.h"
 #include "instance_map.h"
 
+
 /*************************************************************************
   {{{ Platform-specific functions.
 *************************************************************************/