diff options
| author | Paul Eggert | 2011-07-14 09:07:02 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-14 09:07:02 -0700 |
| commit | 5e927815391bbb3a6e25b9bd65a7c59f1a5216ef (patch) | |
| tree | aeea7935a35338a78184dc98354f73e457a43d54 /src/alloc.c | |
| parent | 41f55ccd14109b14de3abd1dc3452f3b465b1883 (diff) | |
| download | emacs-5e927815391bbb3a6e25b9bd65a7c59f1a5216ef.tar.gz emacs-5e927815391bbb3a6e25b9bd65a7c59f1a5216ef.zip | |
* alloc.c (__malloc_size_t): Remove.
All uses replaced by size_t. See Andreas Schwab's note
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9079#8>.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/alloc.c b/src/alloc.c index eb356fd0e83..5848e797b4b 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -68,10 +68,6 @@ extern POINTER_TYPE *sbrk (); | |||
| 68 | #ifdef DOUG_LEA_MALLOC | 68 | #ifdef DOUG_LEA_MALLOC |
| 69 | 69 | ||
| 70 | #include <malloc.h> | 70 | #include <malloc.h> |
| 71 | /* malloc.h #defines this as size_t, at least in glibc2. */ | ||
| 72 | #ifndef __malloc_size_t | ||
| 73 | #define __malloc_size_t size_t | ||
| 74 | #endif | ||
| 75 | 71 | ||
| 76 | /* Specify maximum number of areas to mmap. It would be nice to use a | 72 | /* Specify maximum number of areas to mmap. It would be nice to use a |
| 77 | value that explicitly means "no limit". */ | 73 | value that explicitly means "no limit". */ |
| @@ -82,9 +78,8 @@ extern POINTER_TYPE *sbrk (); | |||
| 82 | 78 | ||
| 83 | /* The following come from gmalloc.c. */ | 79 | /* The following come from gmalloc.c. */ |
| 84 | 80 | ||
| 85 | #define __malloc_size_t size_t | 81 | extern size_t _bytes_used; |
| 86 | extern __malloc_size_t _bytes_used; | 82 | extern size_t __malloc_extra_blocks; |
| 87 | extern __malloc_size_t __malloc_extra_blocks; | ||
| 88 | 83 | ||
| 89 | #endif /* not DOUG_LEA_MALLOC */ | 84 | #endif /* not DOUG_LEA_MALLOC */ |
| 90 | 85 | ||
| @@ -1111,11 +1106,11 @@ static void (*old_free_hook) (void*, const void*); | |||
| 1111 | # define BYTES_USED _bytes_used | 1106 | # define BYTES_USED _bytes_used |
| 1112 | #endif | 1107 | #endif |
| 1113 | 1108 | ||
| 1114 | static __malloc_size_t bytes_used_when_reconsidered; | 1109 | static size_t bytes_used_when_reconsidered; |
| 1115 | 1110 | ||
| 1116 | /* Value of _bytes_used, when spare_memory was freed. */ | 1111 | /* Value of _bytes_used, when spare_memory was freed. */ |
| 1117 | 1112 | ||
| 1118 | static __malloc_size_t bytes_used_when_full; | 1113 | static size_t bytes_used_when_full; |
| 1119 | 1114 | ||
| 1120 | /* This function is used as the hook for free to call. */ | 1115 | /* This function is used as the hook for free to call. */ |
| 1121 | 1116 | ||