diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:24:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:24:06 -0800 |
| commit | 00995c88dde4f8078a843b48faef16668a126d9c (patch) | |
| tree | eff0ed91f09522946ac7aaeae5ad1d2cfc93e7f7 /src/thread.c | |
| parent | fae6cdc8ab0c9becd37afd9c31da56fecfad947b (diff) | |
| parent | 9e59de9449b53c3ecd85b624c11360ba9cafee75 (diff) | |
| download | emacs-00995c88dde4f8078a843b48faef16668a126d9c.tar.gz emacs-00995c88dde4f8078a843b48faef16668a126d9c.tar.bz2 emacs-00995c88dde4f8078a843b48faef16668a126d9c.zip | |
Merge from origin/emacs-26
9e59de9449 Use GCALIGNED properly for GCC
b9d7c90260 In f90.el, set fill-paragraph-function to a useful value
# Conflicts:
# src/lisp.h
Diffstat (limited to 'src/thread.c')
| -rw-r--r-- | src/thread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread.c b/src/thread.c index 03f5b31855e..7335833cf94 100644 --- a/src/thread.c +++ b/src/thread.c @@ -26,7 +26,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ #include "coding.h" #include "syssignal.h" -static struct thread_state GCALIGNED main_thread; +static struct GCALIGNED thread_state main_thread; struct thread_state *current_thread = &main_thread; |