summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2014-10-09 17:00:54 +0200
committerClifford Wolf <clifford@clifford.at>2014-10-09 17:00:54 +0200
commitc7f5aab625bb90e766c1852592fdf42c951716c0 (patch)
tree9f63e1315749454e9bc65f6f00483245528d0ee5
parentfea11f0fa493f227af5383cbad196c4b3585ccc4 (diff)
Replaced "#ifdef WIN32" with "#ifdef _WIN32"
-rw-r--r--kernel/driver.cc2
-rw-r--r--kernel/log.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/driver.cc b/kernel/driver.cc
index 4210d7ca..8a093904 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -269,7 +269,7 @@ int main(int argc, char **argv)
log_hasher = nullptr;
log_spacer();
-#ifdef WIN32
+#ifdef _WIN32
log("End of script. Logfile hash: %s\n", hash.c_str());
#else
struct rusage ru_buffer;
diff --git a/kernel/log.h b/kernel/log.h
index 4514c420..b4182b5f 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -25,7 +25,7 @@
#include <time.h>
#include <sys/time.h>
-#ifndef WIN32
+#ifndef _WIN32
# include <sys/resource.h>
#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_stime.tv_sec + (int64_t) rusage.ru_stime.tv_usec * 1000ULL;
return t;
-#elif WIN32
+#elif _WIN32
return 0;
#else
#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(long int v) { log("%ld", 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(unsigned long long int v) { log("%lld", v); }
#endif