cpp/openttd-patchpack/source Changeset - r6088:dd09788d020f

Changeset - r6088:dd09788d020f

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

Darkvater - 17 years ago 2007-02-20 09:46:10
darkvater@openttd.org

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

4 files changed with 4 insertions and 10 deletions:

src/fios.cpp

src/fios.h

src/newgrf_config.cpp

src/strings.cpp

0 comments (0 inline, 0 general)

src/fios.cpp

➞

Show inline comments

@@ @@ -18,13 +18,12 @@ @@
 #include <sys/stat.h>
 #ifdef WIN32
 # include <io.h>
 #else
 # include <unistd.h>
 # include <dirent.h>
 #endif /* WIN32 */
 /* Variables to display file lists */
 int _fios_num;
 static char *_fios_path;

src/fios.h

➞

Show inline comments

@@ @@ -77,12 +77,16 @@ struct DIR { @@
 	bool at_first_entry;
 };
 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 wrapper around opendir() which will convert the string from
  * OPENTTD encoding to that of the filesystem. For all purposes this
  * function behaves the same as the original opendir function

src/newgrf_config.cpp

➞

Show inline comments

@@ @@ -13,20 +13,16 @@ @@
 #include "newgrf.h"
 #include "newgrf_config.h"
 #include "helpers.hpp"
 #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 */
 GRFConfig *_all_grfs;
 GRFConfig *_grfconfig;
 GRFConfig *_grfconfig_newgame;

src/strings.cpp

➞

Show inline comments

@@ @@ -21,19 +21,14 @@ @@
 #include "table/control_codes.h"
 #include "music.h"
 #include "date.h"
 #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];
 static char *StationGetSpecialString(char *buff, int x, const char* last);
 static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed, const char* last);
 static char *GetSpecialPlayerNameString(char *buff, int ind, const int32 *argv, const char* last);

0 comments (0 inline, 0 general)