Minor fixes.
This commit is contained in:
parent
c8a6e2c6cc
commit
e5b763b075
@ -29,7 +29,9 @@
|
||||
# define strtoll _strtoi64
|
||||
# define strtoull _strtoui64
|
||||
#endif
|
||||
#define chdir _chdir
|
||||
#if _MSC_VER < 1900
|
||||
# define chdir _chdir
|
||||
#endif
|
||||
#define getcwd _getcwd
|
||||
|
||||
#if _MSC_VER < 1800 // Not sure what version introduced this.
|
||||
|
@ -6,7 +6,7 @@
|
||||
#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 <windows.h> // GetFileAttributes
|
||||
#include <direct.h> // _mkdir
|
||||
#include <direct.h> // _mkdir, _chdir
|
||||
#elif NV_OS_XBOX
|
||||
#include <Xtl.h>
|
||||
#elif NV_OS_ORBIS
|
||||
|
@ -232,7 +232,7 @@ namespace nv
|
||||
inline uint64 nextPowerOfTwo(uint64 x)
|
||||
{
|
||||
nvDebugCheck(x != 0);
|
||||
uint p = 1;
|
||||
uint64 p = 1;
|
||||
while (x > p) {
|
||||
p += p;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user