* applied patch #2795448 (Compile fixes - gcc 4.3.3 ubuntu)

This commit is contained in:
tlh2000 2009-05-22 15:52:05 +00:00
parent 44d4eaada3
commit e055079b8a
7 changed files with 6 additions and 4 deletions

View file

@ -693,7 +693,6 @@ static void AiGroupAttackerForTransport(AiForce *aiForce)
}
}
}
#endif
/**
** Force on attack ride. We attack until there is no unit or enemy left.

View file

@ -40,7 +40,7 @@
-- Declarations
----------------------------------------------------------------------------*/
typedef enum AnimationType {
enum AnimationType {
AnimationNone,
AnimationFrame,
AnimationExactFrame,

View file

@ -36,7 +36,7 @@
/**
** Possible outcomes of the game.
*/
typedef enum GameResults {
enum GameResults {
GameNoResult, /// Game has no result
GameVictory, /// Game was won
GameDefeat, /// Game was lost

View file

@ -36,6 +36,7 @@
----------------------------------------------------------------------------*/
#include <vector>
#include <algorithm>
/*----------------------------------------------------------------------------
-- Declarations

View file

@ -506,6 +506,7 @@
#include "SDL.h"
#include <vector>
#include <algorithm>
#ifndef __UPGRADE_STRUCTS_H__
#include "upgrade_structs.h"

View file

@ -46,6 +46,7 @@
#endif
#else
#include <unistd.h>
#include <pthread.h>
#endif
inline int get_cpu_count(void) {

View file

@ -630,7 +630,7 @@ void Exit(int err)
lua_close(Lua);
#endif
fprintf(stdout, _("Thanks for playing Stratagus.\n"));
fprintf(stdout, "%s", _("Thanks for playing Stratagus.\n"));
exit(err);
}