fixed windows build

This commit is contained in:
Evan Tschannen 2018-10-19 13:28:32 -07:00
parent 8dd900a337
commit 888378c8cb
2 changed files with 12 additions and 14 deletions

View File

@ -154,14 +154,6 @@ using std::endl;
__int64 FiletimeAsInt64 (FILETIME &t){
return *(__int64*)&t;
}
int ctzll( uint64_t value ) {
unsigned long count = 0;
if( _BitScanForward64( &count, value ) ) {
return count;
}
return 64;
}
#endif
#ifdef _WIN32

View File

@ -524,6 +524,18 @@ bool isLibraryLoaded(const char* lib_path);
void* loadLibrary(const char* lib_path);
void* loadFunction(void* lib, const char* func_name);
#ifdef _WIN32
inline static int ctzll( uint64_t value ) {
unsigned long count = 0;
if( _BitScanForward64( &count, value ) ) {
return count;
}
return 64;
}
#else
#define ctzll __builtin_ctzll
#endif
// MSVC not support noexcept yet
#ifndef __GNUG__
#ifndef VS14
@ -565,10 +577,4 @@ EXTERNC void setProfilingEnabled(int enabled);
#error Clean builds must define NDEBUG, and not define various debug macros
#endif
#ifdef _WIN32
int ctzll( uint64_t value );
#else
#define ctzll __builtin_ctzll
#endif
#endif /* FLOW_PLATFORM_H */