summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2012-07-19 19:21:47 +0000
committermichi_cc <michi_cc@openttd.org>2012-07-19 19:21:47 +0000
commit36181b3fb27dbb15bb3468c3ebcbbbad5382d70d (patch)
treeeb2844eee18a00d6006a1e8670eeb1e0489fcea7 /src
parent1792c186c7d942b1c28f0382bf7caa685d8c72af (diff)
downloadopenttd-36181b3fb27dbb15bb3468c3ebcbbbad5382d70d.tar.xz
(svn r24417) -Codechange: [Win32] Don't needlessly include windows.h in a commonly used header.
Diffstat (limited to 'src')
-rw-r--r--src/fileio_func.h14
-rw-r--r--src/ini.cpp1
-rw-r--r--src/os/windows/win32.cpp13
3 files changed, 14 insertions, 14 deletions
diff --git a/src/fileio_func.h b/src/fileio_func.h
index 6dea50e9c..25d961bc0 100644
--- a/src/fileio_func.h
+++ b/src/fileio_func.h
@@ -116,7 +116,6 @@ DECLARE_ENUM_AS_BIT_SET(TarScanner::Mode)
/* Implementation of opendir/readdir/closedir for Windows */
#if defined(WIN32)
-#include <windows.h>
struct DIR;
struct dirent { // XXX - only d_name implemented
@@ -127,19 +126,6 @@ struct dirent { // XXX - only d_name implemented
DIR *dir;
};
-struct DIR {
- HANDLE hFind;
- /* the dirent returned by readdir.
- * note: having only one global instance is not possible because
- * multiple independent opendir/readdir sequences must be supported. */
- dirent ent;
- WIN32_FIND_DATA fd;
- /* since opendir calls FindFirstFile, we need a means of telling the
- * first call to readdir that we already have a file.
- * that's the case iff this is true */
- bool at_first_entry;
-};
-
DIR *opendir(const TCHAR *path);
struct dirent *readdir(DIR *d);
int closedir(DIR *d);
diff --git a/src/ini.cpp b/src/ini.cpp
index fe49f5fe7..e82daaceb 100644
--- a/src/ini.cpp
+++ b/src/ini.cpp
@@ -21,6 +21,7 @@
#endif
#ifdef WIN32
+# include <windows.h>
# include <shellapi.h>
# include "core/mem_func.hpp"
#endif
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index 07227222a..dc38a69b3 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -89,6 +89,19 @@ void OSOpenBrowser(const char *url)
* modified from Jan Wassenberg's GPL implementation posted over at
* http://www.gamedev.net/community/forums/topic.asp?topic_id=364584&whichpage=1&#2398903 */
+struct DIR {
+ HANDLE hFind;
+ /* the dirent returned by readdir.
+ * note: having only one global instance is not possible because
+ * multiple independent opendir/readdir sequences must be supported. */
+ dirent ent;
+ WIN32_FIND_DATA fd;
+ /* since opendir calls FindFirstFile, we need a means of telling the
+ * first call to readdir that we already have a file.
+ * that's the case iff this is true */
+ bool at_first_entry;
+};
+
/* suballocator - satisfies most requests with a reusable static instance.
* this avoids hundreds of alloc/free which would fragment the heap.
* To guarantee concurrency, we fall back to malloc if the instance is