mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8823) -Fix (r8821): wrapping opendir to ottd-specific function failed on non-windows because this wrapper was only active for win32 (thx Rubidium)

release/0.6
Darkvater 2007-02-20 09:46:10 +00:00
parent 41d526415c
commit 6d25481221
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fios.cpp
View File

@ -21,7 +21,6 @@
# include <io.h> # include <io.h>
#else #else
# include <unistd.h> # include <unistd.h>
# include <dirent.h>
#endif /* WIN32 */ #endif /* WIN32 */
/* Variables to display file lists */ /* Variables to display file lists */

4
src/fios.h
View File

@ -80,6 +80,10 @@ struct DIR {
DIR *opendir(const wchar_t *path); DIR *opendir(const wchar_t *path);
struct dirent *readdir(DIR *d); struct dirent *readdir(DIR *d);
int closedir(DIR *d); int closedir(DIR *d);
#else
/* Use system-supplied opendir/readdir/closedir functions */
# include <sys/types.h>
# include <dirent.h>
#endif /* defined(WIN32) */ #endif /* defined(WIN32) */
/** /**

4
src/newgrf_config.cpp
View File

@ -16,14 +16,10 @@
#include "fileio.h" #include "fileio.h"
#include "fios.h" #include "fios.h"
#include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef WIN32 #ifdef WIN32
# include <io.h> # include <io.h>
#else
# include <unistd.h>
# include <dirent.h>
#endif /* WIN32 */ #endif /* WIN32 */

5
src/strings.cpp
View File

@ -24,13 +24,8 @@
#include "industry.h" #include "industry.h"
#include "helpers.hpp" #include "helpers.hpp"
#ifdef WIN32
/* for opendir/readdir/closedir */ /* for opendir/readdir/closedir */
# include "fios.h" # include "fios.h"
#else
# include <sys/types.h>
# include <dirent.h>
#endif /* WIN32 */
char _userstring[128]; char _userstring[128];