diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-30 12:14:04 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-30 12:38:52 -0700 |
| commit | f4eb8900295d75c4afec256f75aea22494376fde (patch) | |
| tree | 70203645e9b0b603ef8dbca6c50c01795a081512 /lwlib | |
| parent | d1890a3a4a18f79cabf4caf8d194cdc29ea4bf05 (diff) | |
| download | emacs-f4eb8900295d75c4afec256f75aea22494376fde.tar.gz | |
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 'lwlib')
| -rw-r--r-- | lwlib/lwlib-Xm.c | 1 | ||||
| -rw-r--r-- | lwlib/lwlib.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index c92edd2f9e3..45faff8673a 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -22,6 +22,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <unistd.h> #include <stdio.h> +#include <stdlib.h> #include <setjmp.h> #include <X11/StringDefs.h> diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index d1c5195dbf9..e66147f1fe3 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -26,6 +26,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <sys/types.h> #include <stdio.h> +#include <stdlib.h> #include "lwlib-int.h" #include "lwlib-utils.h" #include <X11/StringDefs.h> |