From fbe7139358ba92f17e733c1cad1b56ae0bdb2051 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 28 Mar 2005 08:48:41 +0000 Subject: (svn r2098) Make a variable static, move a function declaration to a header and remove unnecessary preprocessor magic --- hal.h | 2 ++ misc_gui.c | 8 ++------ ttd.h | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hal.h b/hal.h index 11f059169..4e4b29405 100644 --- a/hal.h +++ b/hal.h @@ -141,6 +141,8 @@ void FiosDelete(const char *name); // Make a filename from a name void FiosMakeSavegameName(char *buf, const char *name); +int CDECL compare_FiosItems(const void *a, const void *b); + void CreateConsole(void); #endif /* HAL_H */ diff --git a/misc_gui.c b/misc_gui.c index dc2294c2c..acfc5e83c 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -20,6 +20,8 @@ #include "hal.h" // for file list +static bool _savegame_sort_dirty; + bool _query_string_active; typedef struct LandInfoData { @@ -1142,12 +1144,6 @@ static void DrawFiosTexts(void) DoDrawString(path, 2, 27, 16); } -#if defined(_WIN32) - extern int CDECL compare_FiosItems (const void *a, const void *b); -#else - extern int compare_FiosItems (const void *a, const void *b); -#endif - static void MakeSortedSaveGameList(void) { diff --git a/ttd.h b/ttd.h index 33cc3c13d..94722b246 100644 --- a/ttd.h +++ b/ttd.h @@ -507,7 +507,6 @@ enum SpecialStrings { typedef void PlaceProc(uint tile); -VARDEF bool _savegame_sort_dirty; VARDEF byte _savegame_sort_order; #define INVALID_UINT_TILE (uint)0xFFFFFFFF -- cgit v1.2.3-54-g00ecf