Commit 8ad12db7 authored by unknown's avatar unknown
Browse files

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:
  Reorganize include file order to avoid problem with gcc 2.95.3
server-tools/instance-manager/instance.cc:
  Reorganize include file order to avoid problem with gcc 2.95.3
parent 4c7aeb36

server-tools/instance-manager/command.cc

+1 −2
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
#pragma implementation

#endif



#include "command.h"

#include "manager.h"



#include "command.h"



Command::Command()

  :guardian(Manager::get_guardian()),

server-tools/instance-manager/instance.cc

+3 −2
Original line number Diff line number Diff line
@@ -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.

*************************************************************************/