diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-05-02 21:20:28 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-05-11 22:06:05 +1000 |
| commit | 584ade67630f4e5c599c8422801e93f352b9a6df (patch) | |
| tree | 195c0e8c49701015d1cd5f4b6092eff00774bac5 | |
| parent | 8669c48d06ca260c13740e0bda97beea52d332fb (diff) | |
| download | haskell-584ade67630f4e5c599c8422801e93f352b9a6df.tar.gz | |
RtsFlags: Make `mallocFailHook` const correct
Test Plan: Validate
Reviewers: hvr, austin, bgamari, simonmar
Reviewed By: bgamari, simonmar
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2193
| -rw-r--r-- | includes/RtsAPI.h | 2 | ||||
| -rw-r--r-- | rts/hooks/Hooks.h | 2 | ||||
| -rw-r--r-- | rts/hooks/MallocFail.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/includes/RtsAPI.h b/includes/RtsAPI.h index 16b848678d..a4a094fd14 100644 --- a/includes/RtsAPI.h +++ b/includes/RtsAPI.h @@ -90,7 +90,7 @@ typedef struct { void (* outOfHeapHook) (W_ request_size, W_ heap_size); // Called when malloc() fails, before exiting - void (* mallocFailHook) (W_ request_size /* in bytes */, char *msg); + void (* mallocFailHook) (W_ request_size /* in bytes */, const char *msg); // Called for every GC void (* gcDoneHook) (unsigned int gen, diff --git a/rts/hooks/Hooks.h b/rts/hooks/Hooks.h index 35a6011aaa..1383ccdb0f 100644 --- a/rts/hooks/Hooks.h +++ b/rts/hooks/Hooks.h @@ -21,7 +21,7 @@ extern char *ghc_rts_opts; extern void OnExitHook (void); extern void StackOverflowHook (W_ stack_size); extern void OutOfHeapHook (W_ request_size, W_ heap_size); -extern void MallocFailHook (W_ request_size /* in bytes */, char *msg); +extern void MallocFailHook (W_ request_size /* in bytes */, const char *msg); extern void FlagDefaultsHook (void); #include "EndPrivate.h" diff --git a/rts/hooks/MallocFail.c b/rts/hooks/MallocFail.c index 63343a770c..42606b6f34 100644 --- a/rts/hooks/MallocFail.c +++ b/rts/hooks/MallocFail.c @@ -11,7 +11,7 @@ #include <stdio.h> void -MallocFailHook (W_ request_size /* in bytes */, char *msg) +MallocFailHook (W_ request_size /* in bytes */, const char *msg) { fprintf(stderr, "malloc: failed on request for %" FMT_Word " bytes; message: %s\n", request_size, msg); } |