diff options
| author | Stefan Monnier | 2023-05-10 11:18:43 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2023-05-10 11:18:43 -0400 |
| commit | e4c8ba6c0589f1ba0ba9993c4f1e9c0821d3ca6c (patch) | |
| tree | d360934aa96f088100c3a38acefa69460638d877 /src/alloc.c | |
| parent | df620591e8cd5d2733659e9c43e97779b0cb8ec5 (diff) | |
| parent | 09bf4768360dd5b8928f90b0b1437f3f5ee43c41 (diff) | |
| download | emacs-e4c8ba6c0589f1ba0ba9993c4f1e9c0821d3ca6c.tar.gz emacs-e4c8ba6c0589f1ba0ba9993c4f1e9c0821d3ca6c.zip | |
Merge branch 'emacs-29'
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index d09fc41dec6..6391ede8d0a 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -398,7 +398,7 @@ static ptrdiff_t pure_bytes_used_non_lisp; | |||
| 398 | 398 | ||
| 399 | /* If positive, garbage collection is inhibited. Otherwise, zero. */ | 399 | /* If positive, garbage collection is inhibited. Otherwise, zero. */ |
| 400 | 400 | ||
| 401 | static intptr_t garbage_collection_inhibited; | 401 | intptr_t garbage_collection_inhibited; |
| 402 | 402 | ||
| 403 | /* The GC threshold in bytes, the last time it was calculated | 403 | /* The GC threshold in bytes, the last time it was calculated |
| 404 | from gc-cons-threshold and gc-cons-percentage. */ | 404 | from gc-cons-threshold and gc-cons-percentage. */ |