diff options
| author | Eli Zaretskii | 2015-11-21 19:44:02 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-11-21 19:44:02 +0200 |
| commit | d696d62fea48096680d6d511a71c4df56d00a51f (patch) | |
| tree | ec9d8707142e396e0de00fffbc5dd9df28800d80 /src/w32fns.c | |
| parent | e6b1818f87f559fdd854bdace2801637caffe6ae (diff) | |
| download | emacs-d696d62fea48096680d6d511a71c4df56d00a51f.tar.gz emacs-d696d62fea48096680d6d511a71c4df56d00a51f.zip | |
Simplify recording of main thread's ID on MS-Windows
* src/w32term.c (w32_initialize):
* src/w32console.c (initialize_w32_display):
* src/w32fns.c (globals_of_w32fns): Don't record the main thread
ID independently for each type of session (GUI, TTY, batch).
* src/w32term.c (w32_init_main_thread): New function, records the
main thread's thread ID.
* src/w32term.h: Add prototype for w32_init_main_thread.
* src/emacs.c (main) [WINDOWSNT]: Call w32_init_main_thread.
* src/emacs-module.c [WINDOWSNT]: Rename main_thread_id to
main_thread, for consistency with other threading libraries. All
users changed. Include w32term.h.
(check_main_thread) [WINDOWSNT]: Simplify the test: no need to
make sure the main thread is alive, as we hold a handle on it
opened by w32_init_main_thread.
(module_init) [WINDOWSNT]: Reuse the thread ID recorded by
w32_init_main_thread, instead of calling the requisite APIs once
more.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index f3391cb98f0..208c9805e91 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -9925,10 +9925,6 @@ globals_of_w32fns (void) | |||
| 9925 | InitCommonControls (); | 9925 | InitCommonControls (); |
| 9926 | 9926 | ||
| 9927 | syms_of_w32uniscribe (); | 9927 | syms_of_w32uniscribe (); |
| 9928 | |||
| 9929 | /* Needed for recovery from C stack overflows in batch mode. */ | ||
| 9930 | if (noninteractive) | ||
| 9931 | dwMainThreadId = GetCurrentThreadId (); | ||
| 9932 | } | 9928 | } |
| 9933 | 9929 | ||
| 9934 | #ifdef NTGUI_UNICODE | 9930 | #ifdef NTGUI_UNICODE |