Fix incorrectly hidden RTS symbols

5 files changed, 6 insertions, 37 deletions

diff --git a/rts/Linker.c b/rts/Linker.c
index 6ef0a21646..78e112ff56 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -501,8 +501,8 @@ typedef struct _RtsSymbolVal {
 #if !defined(mingw32_HOST_OS)
 #define RTS_USER_SIGNALS_SYMBOLS \
    SymI_HasProto(setIOManagerPipe) \
-   SymI_NeedsProto(blockUserSignals) \
-   SymI_NeedsProto(unblockUserSignals)
+   SymI_HasProto(blockUserSignals) \
+   SymI_HasProto(unblockUserSignals)
 #else
 #define RTS_USER_SIGNALS_SYMBOLS     \
    SymI_HasProto(sendIOManagerEvent) \
diff --git a/rts/RtsSignals.h b/rts/RtsSignals.h
index 3b569df5d3..b222272e12 100644
--- a/rts/RtsSignals.h
+++ b/rts/RtsSignals.h
@@ -46,23 +46,6 @@ void resetDefaultHandlers(void);
 void freeSignalHandlers(void);
 
 /*
- * Function: blockUserSignals()
- *
- * Temporarily block the delivery of further console events. Needed to
- * avoid race conditions when GCing the queue of outstanding handlers or
- * when emptying the queue by running the handlers.
- * 
- */
-void blockUserSignals(void);
-
-/*
- * Function: unblockUserSignals()
- *
- * The inverse of blockUserSignals(); re-enable the deliver of console events.
- */
-void unblockUserSignals(void);
-
-/*
  * Function: awaitUserSignals()
  *
  * Wait for the next console event. Currently a NOP (returns immediately.)
diff --git a/rts/RtsUtils.h b/rts/RtsUtils.h
index a47f953383..cbf23b06d5 100644
--- a/rts/RtsUtils.h
+++ b/rts/RtsUtils.h
@@ -43,9 +43,6 @@ void heapCheckFail( void );
 
 void printRtsInfo(void);
 
-HsInt genSymZh(void);
-HsInt resetGenSymZh(void);
-
 /* Alternate to raise(3) for threaded rts, for OpenBSD */
 int genericRaise(int sig);
 
diff --git a/rts/StgPrimFloat.h b/rts/StgPrimFloat.h
index 13d3a5965a..f0e466b76b 100644
--- a/rts/StgPrimFloat.h
+++ b/rts/StgPrimFloat.h
@@ -15,11 +15,12 @@
 void      __decodeDouble_2Int (I_ *man_sign, W_ *man_high, W_ *man_low, I_ *exp, StgDouble dbl);
 void      __decodeFloat_Int (I_ *man, I_ *exp, StgFloat flt);
 StgDouble __2Int_encodeDouble (I_ j_high, I_ j_low, I_ e);
-StgDouble __int_encodeDouble (I_ j, I_ e);
 StgDouble __word_encodeDouble (W_ j, I_ e);
-StgFloat  __int_encodeFloat (I_ j, I_ e);
 StgFloat  __word_encodeFloat (W_ j, I_ e);
 
+// __int_encodeDouble and __int_encodeFloat are public, declared in 
+// includes/rts/PrimFloat.h.
+
 #pragma GCC visibility pop
 
 #endif /* STGPRIMFLOAT_H */
diff --git a/rts/sm/Storage.h b/rts/sm/Storage.h
index ea744a7a74..573d6bcd5b 100644
--- a/rts/sm/Storage.h
+++ b/rts/sm/Storage.h
@@ -25,9 +25,6 @@ void freeStorage(void);
 
 extern bdescr * pinned_object_block;
 
-extern nat alloc_blocks;
-extern nat alloc_blocks_lim;
-
 INLINE_HEADER rtsBool
 doYouWantToGC( void )
 {
@@ -114,16 +111,7 @@ recordMutableLock(StgClosure *p)
 }
 
 /* -----------------------------------------------------------------------------
-   This is the write barrier for MUT_VARs, a.k.a. IORefs.  A
-   MUT_VAR_CLEAN object is not on the mutable list; a MUT_VAR_DIRTY
-   is.  When written to, a MUT_VAR_CLEAN turns into a MUT_VAR_DIRTY
-   and is put on the mutable list.
-   -------------------------------------------------------------------------- */
-
-void dirty_MUT_VAR(StgRegTable *reg, StgClosure *p);
-
-/* -----------------------------------------------------------------------------
-   Similarly, the write barrier for MVARs
+   The write barrier for MVARs
    -------------------------------------------------------------------------- */
 
 void dirty_MVAR(StgRegTable *reg, StgClosure *p);