aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32notify.c
diff options
context:
space:
mode:
authorPaul Eggert2016-09-30 12:14:04 -0700
committerPaul Eggert2016-09-30 12:38:52 -0700
commitf4eb8900295d75c4afec256f75aea22494376fde (patch)
tree70203645e9b0b603ef8dbca6c50c01795a081512 /src/w32notify.c
parentd1890a3a4a18f79cabf4caf8d194cdc29ea4bf05 (diff)
downloademacs-f4eb8900295d75c4afec256f75aea22494376fde.tar.gz
emacs-f4eb8900295d75c4afec256f75aea22494376fde.zip
Limit <config.h>’s includes
This follows up on recent problems with the fact that config.h includes stdlib.h etc.; some files need to include stdlib.h later. config.h generally should limit itself to includes that are universally safe; outside of MS-Windows, only stdbool.h makes the cut among the files currently included. So, move the other includes to just the files that need them (Bug#24506). * configure.ac (config_opsysfile): Remove, as this generic hook is no longer needed. * lib-src/etags.c, src/unexmacosx.c, src/w32.c, src/w32notify.c: * src/w32proc.c (_GNU_SOURCE): Remove, as it’s OK for config.h to do this now. * src/conf_post.h: Include <ms-w32.h>, instead of the generic config_opsysfile, for simplicity as this old way of configuring is now done only for the MS-Windows port. Do not include <ms-w32.h> if DEFER_MS_W32_H, for the benefit of the few files that want its effects later. Do not include <alloca.h>, <string.h>, or <stdlib.h>. Other files modified to include these headers as needed, or to not include headers that are no longer needed. * src/lisp.h: Include <alloca.h> and <string.h> here, since some of the inline functions need them. * src/regex.c: Include <alloca.h> if not emacs. (If emacs, we can rely on SAFE_ALLOCA.) There is no longer any need to worry about HAVE_ALLOCA_H. * src/unexmacosx.c: Rely on config.h not including stdlib.h. * src/w32.c, src/w32notify.c, src/w32proc.c (DEFER_MS_W32_H): Define before including <config.h> first, and include <ms-w32.h> after the troublesome headers.
Diffstat (limited to 'src/w32notify.c')
-rw-r--r--src/w32notify.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32notify.c b/src/w32notify.c
index 15e8a86cf17..32a03f70a66 100644
--- a/src/w32notify.c
+++ b/src/w32notify.c
@@ -81,14 +81,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
81 thread to exit. The main thread waits for some time for the worker 81 thread to exit. The main thread waits for some time for the worker
82 thread to exit, and if it doesn't, terminates it forcibly. */ 82 thread to exit, and if it doesn't, terminates it forcibly. */
83 83
84/* Enable GNU extensions in gnulib replacement headers. */ 84#define DEFER_MS_W32_H
85#define _GNU_SOURCE 1 85#include <config.h>
86 86
87#include <stddef.h> 87#include <stddef.h>
88#include <errno.h> 88#include <errno.h>
89 89
90/* must include CRT headers *before* config.h */ 90/* Include CRT headers *before* ms-w32.h. */
91#include <config.h> 91#include <ms-w32.h>
92 92
93#include <windows.h> 93#include <windows.h>
94 94