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

[John Criswell]

Changes in directory llvm/lib/Support:

PluginLoader.cpp updated: 1.2 -> 1.3
Signals.cpp updated: 1.5 -> 1.6
Timer.cpp updated: 1.20 -> 1.21

---
Log message:

Merged in autoconf branch.  This provides configuration via the autoconf
system.


---
Diffs of the changes:

Index: llvm/lib/Support/PluginLoader.cpp
diff -u llvm/lib/Support/PluginLoader.cpp:1.2 llvm/lib/Support/PluginLoader.cpp:1.3
--- llvm/lib/Support/PluginLoader.cpp:1.2	Thu Jul 25 01:17:46 2002
+++ llvm/lib/Support/PluginLoader.cpp	Mon Jun 30 16:58:48 2003
@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "Support/CommandLine.h"
-#include <dlfcn.h>
-#include <link.h>
+#include "Config/dlfcn.h"
+#include "Config/link.h"
 #include <iostream>
 
 namespace {


Index: llvm/lib/Support/Signals.cpp
diff -u llvm/lib/Support/Signals.cpp:1.5 llvm/lib/Support/Signals.cpp:1.6
--- llvm/lib/Support/Signals.cpp:1.5	Tue May 27 11:25:04 2003
+++ llvm/lib/Support/Signals.cpp	Mon Jun 30 16:58:48 2003
@@ -32,7 +32,7 @@
 
 
 // SignalHandler - The signal handler that runs...
-static void SignalHandler(int Sig) {
+static RETSIGTYPE SignalHandler(int Sig) {
   while (!FilesToRemove.empty()) {
     std::remove(FilesToRemove.back().c_str());
     FilesToRemove.pop_back();


Index: llvm/lib/Support/Timer.cpp
diff -u llvm/lib/Support/Timer.cpp:1.20 llvm/lib/Support/Timer.cpp:1.21
--- llvm/lib/Support/Timer.cpp:1.20	Thu Jun 19 13:42:09 2003
+++ llvm/lib/Support/Timer.cpp	Mon Jun 30 16:58:48 2003
@@ -4,15 +4,16 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "Config/malloc.h"
+
 #include "Support/Timer.h"
 #include "Support/CommandLine.h"
-#include <sys/resource.h>
-#include <sys/time.h>
-#include <unistd.h>
-#ifndef __FreeBSD__
-#include <malloc.h>
-#endif // __FreeBSD__
-#include <stdio.h>
+
+#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>
 #include <functional>
@@ -21,10 +22,12 @@
 std::string LibSupportInfoOutputFilename;
 
 namespace {
+#ifdef HAVE_MALLINFO
   cl::opt<bool>
   TrackSpace("track-memory", cl::desc("Enable -time-passes memory "
                                       "tracking (this may be slow)"),
              cl::Hidden);
+#endif
 
   cl::opt<std::string, true>
   InfoOutputFilename("info-output-file",
@@ -76,12 +79,12 @@
 }
 
 static long getMemUsage() {
-#ifndef __FreeBSD__
+#ifdef HAVE_MALLINFO
   if (TrackSpace) {
     struct mallinfo MI = mallinfo();
     return MI.uordblks/*+MI.hblkhd*/;
   }
-#endif // __FreeBSD__
+#endif
   return 0;
 }