diff options
| author | Po Lu | 2021-11-30 08:16:50 +0800 |
|---|---|---|
| committer | Po Lu | 2021-11-30 08:16:50 +0800 |
| commit | 8f5d2a3181d22f858ede3fb6a1452f99272901fe (patch) | |
| tree | 1921a09e17c7c29d2637b073cf7b2158c71c6017 /src/alloc.c | |
| parent | 901938109f7b5574e97e787bee10441086680de8 (diff) | |
| parent | d8dd705e9d82df96d67d88e1bf90373b6b4fbaa9 (diff) | |
| download | emacs-8f5d2a3181d22f858ede3fb6a1452f99272901fe.tar.gz emacs-8f5d2a3181d22f858ede3fb6a1452f99272901fe.zip | |
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/alloc.c b/src/alloc.c index 22e3e8e2a1b..24dc07b3696 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6152,6 +6152,10 @@ garbage_collect (void) | |||
| 6152 | xg_mark_data (); | 6152 | xg_mark_data (); |
| 6153 | #endif | 6153 | #endif |
| 6154 | 6154 | ||
| 6155 | #ifdef HAVE_HAIKU | ||
| 6156 | mark_haiku_display (); | ||
| 6157 | #endif | ||
| 6158 | |||
| 6155 | #ifdef HAVE_WINDOW_SYSTEM | 6159 | #ifdef HAVE_WINDOW_SYSTEM |
| 6156 | mark_fringe_data (); | 6160 | mark_fringe_data (); |
| 6157 | #endif | 6161 | #endif |