diff options
| author | Tomohiro Matsuyama | 2012-09-15 18:35:24 +0900 |
|---|---|---|
| committer | Tomohiro Matsuyama | 2012-09-15 18:35:24 +0900 |
| commit | 0970d85fef9830e3b8e5cbfbdc04dbf00cc4c027 (patch) | |
| tree | 2f225893ace694a81da09ebdd618b82815659ea7 | |
| parent | 0efc778b8086065f657b8b12f91952ad6b2a8f8c (diff) | |
| download | emacs-0970d85fef9830e3b8e5cbfbdc04dbf00cc4c027.tar.gz emacs-0970d85fef9830e3b8e5cbfbdc04dbf00cc4c027.zip | |
* alloc.c (emacs_blocked_malloc): Remove redundant MALLOC_PROBE.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/alloc.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 27e430d7d0d..feb9c6219fb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-09-15 Tomohiro Matsuyama <tomo@cx4a.org> | ||
| 2 | |||
| 3 | * alloc.c (emacs_blocked_malloc): Remove redundant MALLOC_PROBE. | ||
| 4 | |||
| 1 | 2012-08-21 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-08-21 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * alloc.c: Use bool for booleans. | 7 | * alloc.c: Use bool for booleans. |
diff --git a/src/alloc.c b/src/alloc.c index 389da29a533..36adb49f835 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1346,8 +1346,6 @@ emacs_blocked_malloc (size_t size, const void *ptr) | |||
| 1346 | __malloc_hook = emacs_blocked_malloc; | 1346 | __malloc_hook = emacs_blocked_malloc; |
| 1347 | UNBLOCK_INPUT_ALLOC; | 1347 | UNBLOCK_INPUT_ALLOC; |
| 1348 | 1348 | ||
| 1349 | MALLOC_PROBE (size); | ||
| 1350 | |||
| 1351 | /* fprintf (stderr, "%p malloc\n", value); */ | 1349 | /* fprintf (stderr, "%p malloc\n", value); */ |
| 1352 | return value; | 1350 | return value; |
| 1353 | } | 1351 | } |