aboutsummaryrefslogtreecommitdiffstats
path: root/src/regex.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/regex.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/regex.c')
-rw-r--r--src/regex.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/regex.c b/src/regex.c
index 41c1d3f6106..1917a8480ae 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -50,6 +50,7 @@
50#include <config.h> 50#include <config.h>
51 51
52#include <stddef.h> 52#include <stddef.h>
53#include <stdlib.h>
53 54
54#ifdef emacs 55#ifdef emacs
55/* We need this for `regex.h', and perhaps for the Emacs include files. */ 56/* We need this for `regex.h', and perhaps for the Emacs include files. */
@@ -443,25 +444,12 @@ init_syntax_once (void)
443 444
444#else /* not REGEX_MALLOC */ 445#else /* not REGEX_MALLOC */
445 446
446/* Emacs already defines alloca, sometimes. */
447# ifndef alloca
448
449/* Make alloca work the best possible way. */
450# ifdef __GNUC__
451# define alloca __builtin_alloca
452# else /* not __GNUC__ */
453# ifdef HAVE_ALLOCA_H
454# include <alloca.h>
455# endif /* HAVE_ALLOCA_H */
456# endif /* not __GNUC__ */
457
458# endif /* not alloca */
459
460# ifdef emacs 447# ifdef emacs
461# define REGEX_USE_SAFE_ALLOCA USE_SAFE_ALLOCA 448# define REGEX_USE_SAFE_ALLOCA USE_SAFE_ALLOCA
462# define REGEX_SAFE_FREE() SAFE_FREE () 449# define REGEX_SAFE_FREE() SAFE_FREE ()
463# define REGEX_ALLOCATE SAFE_ALLOCA 450# define REGEX_ALLOCATE SAFE_ALLOCA
464# else 451# else
452# include <alloca.h>
465# define REGEX_ALLOCATE alloca 453# define REGEX_ALLOCATE alloca
466# endif 454# endif
467 455