summaryrefslogtreecommitdiff
path: root/absl
diff options
context:
space:
mode:
authorGravatar zhangxy988 <zhangxy988@gmail.com>2017-12-01 13:55:00 -0500
committerGravatar GitHub <noreply@github.com>2017-12-01 13:55:00 -0500
commit3562f9bb797ac8dd962e899c2633a45eae24522d (patch)
tree2b62c1629a0c3e636ac905ba7cbcc9ae71cf53c9 /absl
parent79610733f46c888b56d05d7ca981350655c55a5d (diff)
parente98380282fdcd1573d478f380dafa08a15d2f9a5 (diff)
Merge pull request #55 from rongjiecomputer/master
MSVC fixes
Diffstat (limited to 'absl')
-rw-r--r--absl/copts.bzl2
-rw-r--r--absl/time/clock.cc4
2 files changed, 4 insertions, 2 deletions
diff --git a/absl/copts.bzl b/absl/copts.bzl
index cc8db2f4..f687f58f 100644
--- a/absl/copts.bzl
+++ b/absl/copts.bzl
@@ -103,7 +103,9 @@ MSVC_FLAGS = [
"/wd4244", # conversion from 'type1' to 'type2', possible loss of data
"/wd4267", # conversion from 'size_t' to 'type', possible loss of data
"/wd4800", # forcing value to bool 'true' or 'false' (performance warning)
+ "/DNOMINMAX", # Don't define min and max macros (windows.h)
"/DWIN32_LEAN_AND_MEAN", # Don't bloat namespace with incompatible winsock versions.
+ "/D_CRT_SECURE_NO_WARNINGS", # Don't warn about usage of insecure C functions
]
MSVC_TEST_FLAGS = [
diff --git a/absl/time/clock.cc b/absl/time/clock.cc
index 6398170d..9f2e0781 100644
--- a/absl/time/clock.cc
+++ b/absl/time/clock.cc
@@ -510,7 +510,7 @@ namespace {
// Returns the maximum duration that SleepOnce() can sleep for.
constexpr absl::Duration MaxSleep() {
#ifdef _WIN32
- // Windows _sleep() takes unsigned long argument in milliseconds.
+ // Windows Sleep() takes unsigned long argument in milliseconds.
return absl::Milliseconds(
std::numeric_limits<unsigned long>::max()); // NOLINT(runtime/int)
#else
@@ -522,7 +522,7 @@ constexpr absl::Duration MaxSleep() {
// REQUIRES: to_sleep <= MaxSleep().
void SleepOnce(absl::Duration to_sleep) {
#ifdef _WIN32
- _sleep(to_sleep / absl::Milliseconds(1));
+ Sleep(to_sleep / absl::Milliseconds(1));
#else
struct timespec sleep_time = absl::ToTimespec(to_sleep);
while (nanosleep(&sleep_time, &sleep_time) != 0 && errno == EINTR) {