[compiler-rt] r183648 - tsan: fix merge bug

[Dmitry Vyukov]

Author: dvyukov
Date: Mon Jun 10 06:11:29 2013
New Revision: 183648

URL: http://llvm.org/viewvc/llvm-project?rev=183648&view=rev
Log:
tsan: fix merge bug

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc?rev=183648&r1=183647&r2=183648&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc Mon Jun 10 06:11:29 2013
@@ -202,10 +202,6 @@ u64 NanoTime() {
   return 0;
 }
 
-u64 NanoTime() {
-  return 0;
-}
-
 void Abort() {
   abort();
   _exit(-1);  // abort is not NORETURN on Windows.