Replaced "#ifdef WIN32" with "#ifdef _WIN32"

This commit is contained in:
Clifford Wolf 2014-10-09 17:00:54 +02:00
parent fea11f0fa4
commit c7f5aab625
2 changed files with 4 additions and 4 deletions

View File

@ -269,7 +269,7 @@ int main(int argc, char **argv)
log_hasher = nullptr; log_hasher = nullptr;
log_spacer(); log_spacer();
#ifdef WIN32 #ifdef _WIN32
log("End of script. Logfile hash: %s\n", hash.c_str()); log("End of script. Logfile hash: %s\n", hash.c_str());
#else #else
struct rusage ru_buffer; struct rusage ru_buffer;

View File

@ -25,7 +25,7 @@
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#ifndef WIN32 #ifndef _WIN32
# include <sys/resource.h> # include <sys/resource.h>
#endif #endif
@ -157,7 +157,7 @@ struct PerformanceTimer
t = 1000000000ULL * (int64_t) rusage.ru_utime.tv_sec + (int64_t) rusage.ru_utime.tv_usec * 1000ULL; t = 1000000000ULL * (int64_t) rusage.ru_utime.tv_sec + (int64_t) rusage.ru_utime.tv_usec * 1000ULL;
t += 1000000000ULL * (int64_t) rusage.ru_stime.tv_sec + (int64_t) rusage.ru_stime.tv_usec * 1000ULL; t += 1000000000ULL * (int64_t) rusage.ru_stime.tv_sec + (int64_t) rusage.ru_stime.tv_usec * 1000ULL;
return t; return t;
#elif WIN32 #elif _WIN32
return 0; return 0;
#else #else
#error Dont know how to measure per-process CPU time. Need alternative method (times()/clocks()/gettimeofday()?). #error Dont know how to measure per-process CPU time. Need alternative method (times()/clocks()/gettimeofday()?).
@ -196,7 +196,7 @@ static inline void log_dump_val_worker(int v) { log("%d", v); }
static inline void log_dump_val_worker(unsigned int v) { log("%u", v); } static inline void log_dump_val_worker(unsigned int v) { log("%u", v); }
static inline void log_dump_val_worker(long int v) { log("%ld", v); } static inline void log_dump_val_worker(long int v) { log("%ld", v); }
static inline void log_dump_val_worker(unsigned long int v) { log("%lu", v); } static inline void log_dump_val_worker(unsigned long int v) { log("%lu", v); }
#ifndef WIN32 #ifndef _WIN32
static inline void log_dump_val_worker(long long int v) { log("%lld", v); } static inline void log_dump_val_worker(long long int v) { log("%lld", v); }
static inline void log_dump_val_worker(unsigned long long int v) { log("%lld", v); } static inline void log_dump_val_worker(unsigned long long int v) { log("%lld", v); }
#endif #endif