diff options
| author | rubidium <rubidium@openttd.org> | 2011-04-30 14:24:23 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-04-30 14:24:23 +0000 |
| commit | 46c242b1dc790e7e55b739dcf5e4133c4ab2e8b2 (patch) | |
| tree | 5f984a3e93055cd737f8d089e33919d13db8553b /src | |
| parent | 1c1e9f69419aa49bfae9fd2975957d4e0b890fb8 (diff) | |
| download | openttd-46c242b1dc790e7e55b739dcf5e4133c4ab2e8b2.tar.xz | |
(svn r22385) -Fix [FS#4603]: strnatcmp is in string.cpp, so it ought to be declared in string_func.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/build_vehicle_gui.cpp | 1 | ||||
| -rw-r--r-- | src/cargotype.cpp | 1 | ||||
| -rw-r--r-- | src/group_gui.cpp | 1 | ||||
| -rw-r--r-- | src/string_func.h | 2 | ||||
| -rw-r--r-- | src/strings_func.h | 2 | ||||
| -rw-r--r-- | src/town_gui.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/dropdown.cpp | 1 |
7 files changed, 7 insertions, 2 deletions
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index 70cd31d62..605c71ebb 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -21,6 +21,7 @@ #include "newgrf_engine.h" #include "newgrf_text.h" #include "group.h" +#include "string_func.h" #include "strings_func.h" #include "window_func.h" #include "date_func.h" diff --git a/src/cargotype.cpp b/src/cargotype.cpp index 66b3840cf..82836b324 100644 --- a/src/cargotype.cpp +++ b/src/cargotype.cpp @@ -13,6 +13,7 @@ #include "cargotype.h" #include "core/bitmath_func.hpp" #include "newgrf_cargo.h" +#include "string_func.h" #include "strings_func.h" #include "core/sort_func.hpp" diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 241582603..d745a5ed2 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -15,6 +15,7 @@ #include "vehicle_gui.h" #include "vehicle_base.h" #include "group.h" +#include "string_func.h" #include "strings_func.h" #include "window_func.h" #include "vehicle_func.h" diff --git a/src/string_func.h b/src/string_func.h index 27cff81f7..1fb58b46a 100644 --- a/src/string_func.h +++ b/src/string_func.h @@ -210,4 +210,6 @@ char *strndup(const char *s, size_t len); char *strcasestr(const char *haystack, const char *needle); #endif /* strcasestr is available */ +int strnatcmp(const char *s1, const char *s2); + #endif /* STRING_FUNC_H */ diff --git a/src/strings_func.h b/src/strings_func.h index c91e75ad4..fcef87b3e 100644 --- a/src/strings_func.h +++ b/src/strings_func.h @@ -198,6 +198,4 @@ int CDECL StringIDSorter(const StringID *a, const StringID *b); void CheckForMissingGlyphsInLoadedLanguagePack(); -int strnatcmp(const char *s1, const char *s2); - #endif /* STRINGS_FUNC_H */ diff --git a/src/town_gui.cpp b/src/town_gui.cpp index aa95884f0..f5b5d0fd0 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -18,6 +18,7 @@ #include "company_base.h" #include "company_gui.h" #include "network/network.h" +#include "string_func.h" #include "strings_func.h" #include "sound_func.h" #include "economy_func.h" diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index 1b5ba6a01..f2e9cc2c1 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -11,6 +11,7 @@ #include "../stdafx.h" #include "../window_gui.h" +#include "../string_func.h" #include "../strings_func.h" #include "../window_func.h" #include "dropdown_type.h" |