Mercurial > hg > openttd

changeset 6088:636539830f0e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8823) -Fix (r8821): wrapping opendir to ottd-specific function failed on non-windows because this wrapper was only active for win32 (thx Rubidium)
author Darkvater <Darkvater@openttd.org>
date Tue, 20 Feb 2007 09:46:10 +0000
parents 637ddb9e6519
children cedfb953efbf
files src/fios.cpp src/fios.h src/newgrf_config.cpp src/strings.cpp
diffstat 4 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -21,7 +21,6 @@
 # include <io.h>
 #else
 # include <unistd.h>
-# include <dirent.h>
 #endif /* WIN32 */
 
 /* Variables to display file lists */
--- a/src/fios.h
+++ b/src/fios.h
@@ -80,6 +80,10 @@
 DIR *opendir(const wchar_t *path);
 struct dirent *readdir(DIR *d);
 int closedir(DIR *d);
+#else
+/* Use system-supplied opendir/readdir/closedir functions */
+# include <sys/types.h>
+# include <dirent.h>
 #endif /* defined(WIN32) */
 
 /**
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -16,14 +16,10 @@
 
 #include "fileio.h"
 #include "fios.h"
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #ifdef WIN32
 # include <io.h>
-#else
-# include <unistd.h>
-# include <dirent.h>
 #endif /* WIN32 */
 
 
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -24,13 +24,8 @@
 #include "industry.h"
 #include "helpers.hpp"
 
-#ifdef WIN32
 /* for opendir/readdir/closedir */
 # include "fios.h"
-#else
-# include <sys/types.h>
-# include <dirent.h>
-#endif /* WIN32 */
 
 char _userstring[128];