aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 5c860bc1f8e..2ce74f97ff7 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1161,9 +1161,7 @@ static void (*old_free_hook) (void*, const void*);
1161/* This function is used as the hook for free to call. */ 1161/* This function is used as the hook for free to call. */
1162 1162
1163static void 1163static void
1164emacs_blocked_free (ptr, ptr2) 1164emacs_blocked_free (void *ptr, const void *ptr2)
1165 void *ptr;
1166 const void *ptr2;
1167{ 1165{
1168 BLOCK_INPUT_ALLOC; 1166 BLOCK_INPUT_ALLOC;
1169 1167
@@ -1211,9 +1209,7 @@ emacs_blocked_free (ptr, ptr2)
1211/* This function is the malloc hook that Emacs uses. */ 1209/* This function is the malloc hook that Emacs uses. */
1212 1210
1213static void * 1211static void *
1214emacs_blocked_malloc (size, ptr) 1212emacs_blocked_malloc (size_t size, const void *ptr)
1215 size_t size;
1216 const void *ptr;
1217{ 1213{
1218 void *value; 1214 void *value;
1219 1215
@@ -1260,10 +1256,7 @@ emacs_blocked_malloc (size, ptr)
1260/* This function is the realloc hook that Emacs uses. */ 1256/* This function is the realloc hook that Emacs uses. */
1261 1257
1262static void * 1258static void *
1263emacs_blocked_realloc (ptr, size, ptr2) 1259emacs_blocked_realloc (void *ptr, size_t size, const void *ptr2)
1264 void *ptr;
1265 size_t size;
1266 const void *ptr2;
1267{ 1260{
1268 void *value; 1261 void *value;
1269 1262
@@ -1337,7 +1330,7 @@ reset_malloc_hooks ()
1337/* Called from main to set up malloc to use our hooks. */ 1330/* Called from main to set up malloc to use our hooks. */
1338 1331
1339void 1332void
1340uninterrupt_malloc () 1333uninterrupt_malloc (void)
1341{ 1334{
1342#ifdef HAVE_GTK_AND_PTHREAD 1335#ifdef HAVE_GTK_AND_PTHREAD
1343#ifdef DOUG_LEA_MALLOC 1336#ifdef DOUG_LEA_MALLOC