mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r8823) -Fix (r8821): wrapping opendir to ottd-specific function failed on non-windows because this wrapper was only active for win32 (thx Rubidium)
This commit is contained in:
parent
41d526415c
commit
6d25481221
|
@ -21,7 +21,6 @@
|
|||
# include <io.h>
|
||||
#else
|
||||
# include <unistd.h>
|
||||
# include <dirent.h>
|
||||
#endif /* WIN32 */
|
||||
|
||||
/* Variables to display file lists */
|
||||
|
|
|
@ -80,6 +80,10 @@ struct DIR {
|
|||
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) */
|
||||
|
||||
/**
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
||||
|
|
|
@ -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];
|
||||
|
||||
|
|
Loading…
Reference in New Issue