[llvm-commits] CVS: llvm/lib/Support/Timer.cpp

[John Criswell]

Changes in directory llvm/lib/Support:

Timer.cpp updated: 1.18.2.1 -> 1.18.2.2

---
Log message:

Merged with mainline on Thursday, June 26, 2003.


---
Diffs of the changes:

Index: llvm/lib/Support/Timer.cpp
diff -u llvm/lib/Support/Timer.cpp:1.18.2.1 llvm/lib/Support/Timer.cpp:1.18.2.2
--- llvm/lib/Support/Timer.cpp:1.18.2.1	Mon Jun 23 14:07:06 2003
+++ llvm/lib/Support/Timer.cpp	Thu Jun 26 16:35:23 2003
@@ -12,6 +12,7 @@
 #include "Config/sys/resource.h"
 #include "Config/sys/time.h"
 #include "Config/unistd.h"
+#include "Config/malloc.h"
 #include "Config/stdio.h"
 #include <iostream>
 #include <algorithm>
@@ -82,12 +83,9 @@
   if (TrackSpace) {
     struct mallinfo MI = mallinfo();
     return MI.uordblks/*+MI.hblkhd*/;
-  } else {
-    return 0;
   }
-#else
-    return 0;
-#endif
+#endif // __FreeBSD__
+  return 0;
 }
 
 struct TimeRecord {