Make it actually compile on Solaris.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17815 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/System/SunOS/TimeValue.cpp b/lib/System/SunOS/TimeValue.cpp
index 7e47331b3f64680339ef25d49b1b8a06d098f72b..a4a238ba530f7a38a9cc6150e81a35619eda1d7b 100644 (file)
--- a/lib/System/SunOS/TimeValue.cpp
+++ b/lib/System/SunOS/TimeValue.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 // Include the generic Unix implementation
-#include "../Unix/Unix.cpp"
+#include "../Unix/TimeValue.cpp"
 
 namespace llvm {
 using namespace sys;

diff --git a/lib/System/Unix/TimeValue.cpp b/lib/System/Unix/TimeValue.cpp
index 6b476c86cad3003a8b5e21b346c34403f902cf92..d140af9add79b52e9ef98f1d0f357bb1e873ddb0 100644 (file)
--- a/lib/System/Unix/TimeValue.cpp
+++ b/lib/System/Unix/TimeValue.cpp
@@ -37,7 +37,7 @@ std::string TimeValue::toString() {
 
 TimeValue TimeValue::now() {
   struct timeval the_time;
-  ::timerclear(&the_time);
+  timerclear(&the_time);
   if (0 != ::gettimeofday(&the_time,0)) 
     ThrowErrno("Couldn't obtain time of day");
 

diff --git a/lib/System/Unix/TimeValue.inc b/lib/System/Unix/TimeValue.inc
index 6b476c86cad3003a8b5e21b346c34403f902cf92..d140af9add79b52e9ef98f1d0f357bb1e873ddb0 100644 (file)
--- a/lib/System/Unix/TimeValue.inc
+++ b/lib/System/Unix/TimeValue.inc
@@ -37,7 +37,7 @@ std::string TimeValue::toString() {
 
 TimeValue TimeValue::now() {
   struct timeval the_time;
-  ::timerclear(&the_time);
+  timerclear(&the_time);
   if (0 != ::gettimeofday(&the_time,0)) 
     ThrowErrno("Couldn't obtain time of day");