diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 5 | ||||
| -rw-r--r-- | src/gmalloc.c | 2 | ||||
| -rw-r--r-- | src/makefile.w32-in | 6 | ||||
| -rw-r--r-- | src/regex.c | 4 |
5 files changed, 10 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 913a5376f22..dec5ee328a7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-06-26 Paul Eggert <eggert@cs.ucla.edu> + + Clean out last vestiges of the old HAVE_CONFIG_H stuff. + * Makefile.in (ALL_CFLAGS): + * makefile.w32-in (LOCAL_FLAGS): Remove -DHAVE_CONFIG_H. + * gmalloc.c, regex.c: Include <config.h> unconditionally. + 2012-06-25 Dmitry Antipov <dmantipov@yandex.ru> * dispextern.h (xstrcasecmp): Define to library function diff --git a/src/Makefile.in b/src/Makefile.in index 40cfe94c707..b0adf53a9b1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -303,11 +303,8 @@ MKDEPDIR=@MKDEPDIR@ ## -Demacs is needed to make some files produce the correct version ## for use in Emacs. ## -## -DHAVE_CONFIG_H is needed for some other files to take advantage of -## the information in `config.h'. -## ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG. -ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I$(srcdir) \ +ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ -I$(lib) -I$(srcdir)/../lib \ $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ diff --git a/src/gmalloc.c b/src/gmalloc.c index 0df050e127a..3de3733d55f 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -21,9 +21,7 @@ Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #ifdef HAVE_PTHREAD #define USE_PTHREAD diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 01f8a1a4ac5..c9077cc84dd 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -27,11 +27,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp # Size in MBs of the static heap in temacs.exe. HEAPSIZE = 27 -# -# HAVE_CONFIG_H is required by some generic gnu sources stuck into -# the emacs source tree. -# -LOCAL_FLAGS = -Demacs=1 -DHAVE_CONFIG_H -I../lib -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS) +LOCAL_FLAGS = -Demacs=1 -I../lib -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS) SRC = . EMACS = $(BLD)/emacs.exe diff --git a/src/regex.c b/src/regex.c index 7ef53c606c9..0b09e508b37 100644 --- a/src/regex.c +++ b/src/regex.c @@ -46,9 +46,7 @@ # endif #endif -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <stddef.h> |