summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-10-19 14:17:47 +0100
committerIan Lynagh <igloo@earth.li>2011-10-19 14:17:47 +0100
commit7ef5b2939076902ee54c9f1a2c50d55b274e4388 (patch)
treec0f5c8efd29af870601787e26a2e3ef9dc0f669b /includes
parent38c8b565ff8d8011e26af8ae4b03800ca29d3f38 (diff)
parentddd3c5199fd40386c6385689fdf5c542f831bcf0 (diff)
downloadhaskell-7ef5b2939076902ee54c9f1a2c50d55b274e4388.tar.gz
Merge branch 'master' of http://darcs.haskell.org/ghc
Conflicts: compiler/utils/Platform.hs
Diffstat (limited to 'includes')
-rw-r--r--includes/rts/Stable.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/includes/rts/Stable.h b/includes/rts/Stable.h
index 38ca665bfb..ec867e486c 100644
--- a/includes/rts/Stable.h
+++ b/includes/rts/Stable.h
@@ -15,8 +15,7 @@
#define RTS_STABLE_H
EXTERN_INLINE StgPtr deRefStablePtr (StgStablePtr stable_ptr);
-StgStablePtr getStablePtr (StgPtr p);
-void freeStablePtr (StgStablePtr sp);
+StgStablePtr getStablePtr (StgPtr p);
/* -----------------------------------------------------------------------------
PRIVATE from here.