aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32.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/w32.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/w32.c')
-rw-r--r--src/w32.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32.c b/src/w32.c
index 6cb8e748bd5..e0a34060f0a 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -21,8 +21,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
21 Geoff Voelker (voelker@cs.washington.edu) 7-29-94 21 Geoff Voelker (voelker@cs.washington.edu) 7-29-94
22*/ 22*/
23 23
24/* Enable GNU extensions in gnulib replacement headers. */ 24#define DEFER_MS_W32_H
25#define _GNU_SOURCE 1 25#include <config.h>
26 26
27#include <mingw_time.h> 27#include <mingw_time.h>
28#include <stddef.h> /* for offsetof */ 28#include <stddef.h> /* for offsetof */
@@ -40,9 +40,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
40#include <sys/utime.h> 40#include <sys/utime.h>
41#include <math.h> 41#include <math.h>
42 42
43/* must include CRT headers *before* config.h */ 43/* Include CRT headers *before* ms-w32.h. */
44#include <ms-w32.h>
44 45
45#include <config.h>
46#include <mbstring.h> /* for _mbspbrk, _mbslwr, _mbsrchr, ... */ 46#include <mbstring.h> /* for _mbspbrk, _mbslwr, _mbsrchr, ... */
47 47
48#undef access 48#undef access