FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation errors with MSVC++

Browse Source
This commit is contained in:
Bertrand Coconnier 2016-07-03 11:53:23 +02:00
parent efa1292b2d
commit d3c5c45262
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
simgear/misc/sg_dir.cxx
View File

@ -32,6 +32,7 @@
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# include <direct.h> # include <direct.h>
# include <Shlwapi.h>
#else #else
# include <sys/types.h> # include <sys/types.h>
# include <dirent.h> # include <dirent.h>

4
simgear/misc/sg_path.cxx
View File

@ -988,7 +988,7 @@ std::wstring SGPath::wstr() const
{ {
#ifdef SG_WINDOWS #ifdef SG_WINDOWS
size_t buflen = mbstowcs(NULL, path.c_str(), 0)+1; size_t buflen = mbstowcs(NULL, path.c_str(), 0)+1;
wchar_t wideBuf = malloc(buflen * sizeof(int)); wchar_t* wideBuf = malloc(buflen * sizeof(int));
if (wideBuf) { if (wideBuf) {
size_t count = mbstowcs(wideBuf, path.c_str(), buflen); size_t count = mbstowcs(wideBuf, path.c_str(), buflen);
if (count == (size_t)-1) { if (count == (size_t)-1) {
@ -1002,5 +1002,5 @@ std::wstring SGPath::wstr() const
SG_LOG( SG_GENERAL, SG_ALERT, "SGPath::wstr: unable to allocate enough memory for " << *this ); SG_LOG( SG_GENERAL, SG_ALERT, "SGPath::wstr: unable to allocate enough memory for " << *this );
} }
#endif #endif
return std::wstring();
} }