(svn r2098) Make a variable static, move a function declaration to a header and remove unnecessary preprocessor magic
--- a/hal.h Mon Mar 28 08:17:35 2005 +0000
+++ b/hal.h Mon Mar 28 08:48:41 2005 +0000
@@ -141,6 +141,8 @@
// 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 */
--- a/misc_gui.c Mon Mar 28 08:17:35 2005 +0000
+++ b/misc_gui.c Mon Mar 28 08:48:41 2005 +0000
@@ -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 @@
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)
{
--- a/ttd.h Mon Mar 28 08:17:35 2005 +0000
+++ b/ttd.h Mon Mar 28 08:48:41 2005 +0000
@@ -507,7 +507,6 @@
typedef void PlaceProc(uint tile);
-VARDEF bool _savegame_sort_dirty;
VARDEF byte _savegame_sort_order;
#define INVALID_UINT_TILE (uint)0xFFFFFFFF