diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-05-01 21:59:50 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-05-02 06:13:56 +1000 |
| commit | 868d2c473d6faeb23d8626fd21fa342e29b582f4 (patch) | |
| tree | cc0884bb5a6ac3768ee76292d067020379984bff | |
| parent | e6627d1f8964807f19f8773f09cfaacae7ca8ab8 (diff) | |
| download | haskell-868d2c473d6faeb23d8626fd21fa342e29b582f4.tar.gz | |
rts: Remove deprecated C type `lnat`
Summary:
The `lnat` type was deprecated in 2012 in commit 41737f12f9 with
a note to use `StgWord` instead.
Test Plan: Validate on Linux and OS X
Reviewers: simonmar, austin, Phyx, hvr, bgamari
Reviewed By: simonmar, Phyx, bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2164
| -rw-r--r-- | includes/rts/Types.h | 3 | ||||
| -rw-r--r-- | testsuite/tests/rts/testblockalloc.c | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/testheapalloced.c | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/testmblockalloc.c | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/includes/rts/Types.h b/includes/rts/Types.h index 88d0b34906..1791b88772 100644 --- a/includes/rts/Types.h +++ b/includes/rts/Types.h @@ -18,9 +18,6 @@ typedef unsigned int nat; /* at least 32 bits (like int) */ -// Deprecated; just use StgWord instead -typedef StgWord lnat; - /* ullong (64|128-bit) type: only include if needed (not ANSI) */ #if defined(__GNUC__) #define LL(x) (x##LL) diff --git a/testsuite/tests/rts/testblockalloc.c b/testsuite/tests/rts/testblockalloc.c index b49ae00bac..bde81d31e5 100644 --- a/testsuite/tests/rts/testblockalloc.c +++ b/testsuite/tests/rts/testblockalloc.c @@ -11,7 +11,7 @@ const int MAXALLOC = ((8 * 1024 * 1024) / BLOCK_SIZE - 1); //const int MAXALLOC = ((64 * 1024 * 1024) / BLOCK_SIZE - 1); const int SEED = 0xf00f00; -extern lnat mblocks_allocated; +extern StgWord mblocks_allocated; int main (int argc, char *argv[]) { diff --git a/testsuite/tests/rts/testheapalloced.c b/testsuite/tests/rts/testheapalloced.c index 3d8fa05eb3..e827ae2208 100644 --- a/testsuite/tests/rts/testheapalloced.c +++ b/testsuite/tests/rts/testheapalloced.c @@ -21,7 +21,7 @@ const int MAXALLOC = ((8 * 1024 * 1024) / BLOCK_SIZE - 1); //const int MAXALLOC = ((4 * 1024 * 1024) / BLOCK_SIZE - 1); const int SEED = 0xf00f00; -extern lnat mblocks_allocated; +extern StgWord mblocks_allocated; int main (int argc, char *argv[]) { diff --git a/testsuite/tests/rts/testmblockalloc.c b/testsuite/tests/rts/testmblockalloc.c index df03658387..cbfd050342 100644 --- a/testsuite/tests/rts/testmblockalloc.c +++ b/testsuite/tests/rts/testmblockalloc.c @@ -9,7 +9,7 @@ const int ARRSIZE = 64; const int LOOPS = 1000; const int SEED = 0xf00f00; -extern lnat mblocks_allocated; +extern StgWord mblocks_allocated; int main (int argc, char *argv[]) { |