Changeset 281 for cpp/common/nonstd_stdio.h

Timestamp:

12/27/14 01:01:43 (9 years ago)

Author:

Maciej Komosinski

Message:

Support for wide char (unicode) names of files and directories under Windows, internally encoded as char* utf-8

File:

• cpp/common/nonstd_stdio.h (modified) (3 diffs)

cpp/common/nonstd_stdio.h

@@ -20 +20 @@
  #include <dir.h>
 #else
- #ifndef MOBILE2D
  #include <direct.h>
- #endif
  #define mkdir _mkdir
+ #define S_ISDIR(m)     (((m)&S_IFDIR)==S_IFDIR)
 #endif
 
-#ifndef MOBILE2D
- #include <io.h> //borland compiler: include <io.h> before <dir.h> causes the SimWorld class in "simul.h" be unrecognized, for unknown reason :O moreover, this problem is only pertinent to the CLI project, not GUI. Maybe this is caused by global defines like NOVCL, NO_STRICT etc.?
+#include <io.h> //borland compiler: include <io.h> before <dir.h> causes the SimWorld class in "simul.h" be unrecognized, for unknown reason :O moreover, this problem is only pertinent to the CLI project, not GUI. Maybe this is caused by global defines like NOVCL, NO_STRICT etc.?
 // #define makeDirectory(name) mkdir(name)
-#endif
-
- #define S_ISDIR(x) ((x & _S_IFDIR)==_S_IFDIR)
 
 #else
 
- #include <unistd.h>
- #include <sys/stat.h>
+#include <unistd.h>
+#include <sys/stat.h>
 // #define makeDirectory(name) mkdir(name,0777)
- #define _unlink unlink //_unlink jest ISO-conformant, unlink jest POSIX-deprecated
- #define _stat stat
+#define _unlink unlink //_unlink jest ISO-conformant, unlink jest POSIX-deprecated
+#define _stat stat
 #endif
 
@@ -49 +44 @@
 #ifdef __ANDROID__
 #include <nv_file/nv_file.h>
- struct rwFILE //jedno z dwoch pol jest zainicjowane w zaleznosci od tego gdzie jest plik
- { //nvidia uses a similar trick in nv_file.h (STD_FILE and APK_FILE), maybe doing a similar thing here is redundant? but their trick uses some trial-and-error code (see NvFOpen())
+struct rwFILE //jedno z dwoch pol jest zainicjowane w zaleznosci od tego gdzie jest plik
+{ //nvidia uses a similar trick in nv_file.h (STD_FILE and APK_FILE), maybe doing a similar thing here is redundant? but their trick uses some trial-and-error code (see NvFOpen())
         NvFile *rfile; //can only read
         FILE *rwfile;
         rwFILE() {rfile=rwfile=NULL;}
- };
- typedef rwFILE MFILE;
+};
+typedef rwFILE MFILE;
 #else //SHP:
- //z <stdio.h> wzielismy sprintfy i inne ktore dzia³aj¹...
- #include <FIo.h>
- // wklejone z sailora w ramach integracji frams+engine
- // ale to nie sprawia ze framsy korzystaja z mfile - potrzebna jest implementacja virtfile dla bady! (patrz: stdiofile.h)
- // i wtedy bedzie mozna mfile wywalic tez z sailora
- typedef Osp::Io::File MFILE;
+//z <stdio.h> wzielismy sprintfy i inne ktore dzia³aj¹...
+#include <FIo.h>
+// wklejone z sailora w ramach integracji frams+engine
+// ale to nie sprawia ze framsy korzystaja z mfile - potrzebna jest implementacja virtfile dla bady! (patrz: stdiofile.h)
+// i wtedy bedzie mozna mfile wywalic tez z sailora
+typedef Osp::Io::File MFILE;
 #endif
 
@@ -82 +77 @@
 
 #else
- typedef FILE MFILE;
+typedef FILE MFILE;
+#ifdef _WIN32
+ #define mfopen _wfopen
+#else
  #define mfopen fopen
- #define mfclose fclose
- #define mfread fread
- #define mfwrite fwrite
- #define mfputs fputs
- #define mfgets fgets
- #define mfeof feof
- #define mfseek fseek
- #define mftell ftell
+#endif
+#define mfclose fclose
+#define mfread fread
+#define mfwrite fwrite
+#define mfputs fputs
+#define mfgets fgets
+#define mfeof feof
+#define mfseek fseek
+#define mftell ftell
 #endif