drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fixes.

Browse Source
This commit is contained in:
Ignacio 2020-03-23 09:54:09 -07:00
parent c8a6e2c6cc
commit e5b763b075
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvcore/DefsVcWin32.h
View File

@ -29,7 +29,9 @@
# define strtoll _strtoi64 # define strtoll _strtoi64
# define strtoull _strtoui64 # define strtoull _strtoui64
#endif #endif
#if _MSC_VER < 1900
# define chdir _chdir # define chdir _chdir
#endif
#define getcwd _getcwd #define getcwd _getcwd
#if _MSC_VER < 1800 // Not sure what version introduced this. #if _MSC_VER < 1800 // Not sure what version introduced this.

2
src/nvcore/FileSystem.cpp
View File

@ -6,7 +6,7 @@
#define _CRT_NONSTDC_NO_WARNINGS // _chdir is defined deprecated, but that's a bug, chdir is deprecated, _chdir is *not*. #define _CRT_NONSTDC_NO_WARNINGS // _chdir is defined deprecated, but that's a bug, chdir is deprecated, _chdir is *not*.
//#include <shlwapi.h> // PathFileExists //#include <shlwapi.h> // PathFileExists
#include <windows.h> // GetFileAttributes #include <windows.h> // GetFileAttributes
#include <direct.h> // _mkdir #include <direct.h> // _mkdir, _chdir
#elif NV_OS_XBOX #elif NV_OS_XBOX
#include <Xtl.h> #include <Xtl.h>
#elif NV_OS_ORBIS #elif NV_OS_ORBIS

2
src/nvcore/Utils.h
View File

@ -232,7 +232,7 @@ namespace nv
inline uint64 nextPowerOfTwo(uint64 x) inline uint64 nextPowerOfTwo(uint64 x)
{ {
nvDebugCheck(x != 0); nvDebugCheck(x != 0);
uint p = 1; uint64 p = 1;
while (x > p) { while (x > p) {
p += p; p += p;
} }