diff options
| author | Paul Eggert | 2016-09-30 12:14:04 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-09-30 12:38:52 -0700 |
| commit | f4eb8900295d75c4afec256f75aea22494376fde (patch) | |
| tree | 70203645e9b0b603ef8dbca6c50c01795a081512 /src/w32proc.c | |
| parent | d1890a3a4a18f79cabf4caf8d194cdc29ea4bf05 (diff) | |
| download | emacs-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/w32proc.c')
| -rw-r--r-- | src/w32proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32proc.c b/src/w32proc.c index e23b1b3563c..aef4e44d73a 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -22,8 +22,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 22 | Adapted from alarm.c by Tim Fleehart | 22 | Adapted from alarm.c by Tim Fleehart |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | /* Enable GNU extensions in gnulib replacement headers. */ | 25 | #define DEFER_MS_W32_H |
| 26 | #define _GNU_SOURCE 1 | 26 | #include <config.h> |
| 27 | 27 | ||
| 28 | #include <mingw_time.h> | 28 | #include <mingw_time.h> |
| 29 | #include <stdio.h> | 29 | #include <stdio.h> |
| @@ -38,8 +38,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 38 | #include <mbstring.h> | 38 | #include <mbstring.h> |
| 39 | #include <locale.h> | 39 | #include <locale.h> |
| 40 | 40 | ||
| 41 | /* must include CRT headers *before* config.h */ | 41 | /* Include CRT headers *before* ms-w32.h. */ |
| 42 | #include <config.h> | 42 | #include <ms-w32.h> |
| 43 | 43 | ||
| 44 | #undef signal | 44 | #undef signal |
| 45 | #undef wait | 45 | #undef wait |