tsan: fix merge bug

llvm-svn: 183648

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
index 2281c5af815c4f6cffb9ebd37bebb9b06b2a6e05..164dfdd8e5d651bd63008e154705305d5a74380a 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
@@ -202,10 +202,6 @@ u64 NanoTime() {
   return 0;
 }
 
-u64 NanoTime() {
-  return 0;
-}
-
 void Abort() {
   abort();
   _exit(-1);  // abort is not NORETURN on Windows.