[commit: ghc] master: Expose the prototype for getMonotonicNSec (fd3fd18)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/fd3fd18a570d7b61e72614fc9594e721d8a53ab0

>---------------------------------------------------------------

commit fd3fd18a570d7b61e72614fc9594e721d8a53ab0
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Jan 17 15:33:26 2013 +0000

    Expose the prototype for getMonotonicNSec
    
    Fixes T3807 on OS X 32.

>---------------------------------------------------------------

 includes/Rts.h                      |    1 +
 includes/rts/{Timer.h => GetTime.h} |   12 +++++-------
 rts/GetTime.h                       |    1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/includes/Rts.h b/includes/Rts.h
index edb48c1..b2f44cb 100644
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -226,6 +226,7 @@ INLINE_HEADER Time fsecondsToTime (double t)
 #include "rts/Flags.h"
 #include "rts/Adjustor.h"
 #include "rts/FileLock.h"
+#include "rts/GetTime.h"
 #include "rts/Globals.h"
 #include "rts/IOManager.h"
 #include "rts/Linker.h"
diff --git a/includes/rts/Timer.h b/includes/rts/GetTime.h
similarity index 65%
copy from includes/rts/Timer.h
copy to includes/rts/GetTime.h
index 9563f6a..79cef4f 100644
--- a/includes/rts/Timer.h
+++ b/includes/rts/GetTime.h
@@ -2,7 +2,7 @@
  *
  * (c) The GHC Team, 1995-2009
  *
- * Interface to the RTS timer signal (uses OS-dependent Ticker.h underneath)
+ * Interface to the RTS time
  *
  * Do not #include this file directly: #include "Rts.h" instead.
  *
@@ -11,11 +11,9 @@
  *
  * ---------------------------------------------------------------------------*/
 
-#ifndef RTS_TIMER_H
-#define RTS_TIMER_H
+#ifndef RTS_GETTIME_H
+#define RTS_GETTIME_H
 
-void startTimer (void);
-void stopTimer  (void);
-int rtsTimerSignal (void);
+StgWord64 getMonotonicNSec (void);
 
-#endif /* RTS_TIMER_H */
+#endif /* RTS_GETTIME_H */
diff --git a/rts/GetTime.h b/rts/GetTime.h
index 4b967b5..32c3754 100644
--- a/rts/GetTime.h
+++ b/rts/GetTime.h
@@ -12,7 +12,6 @@
 #include "BeginPrivate.h"
 
 void initializeTimer       (void);
-StgWord64 getMonotonicNSec (void);
 
 Time getProcessCPUTime     (void);
 Time getThreadCPUTime      (void);