diff --git a/ChangeLog b/ChangeLog index ecbfaa502a7..5e30b570922 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-06-26 Paul Eggert + + Clean out last vestiges of the old HAVE_CONFIG_H stuff. + * lib/makefile.w32-in (LOCAL_FLAGS): Remove -DHAVE_CONFIG_H. + 2012-06-25 Dmitry Antipov * configure.in (AC_CHECK_FUNCS): Detect library functions diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index a04fe215f99..3b4465df607 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,13 @@ +2012-06-26 Paul Eggert + + Clean out last vestiges of the old HAVE_CONFIG_H stuff. + * Makefile.in (BASE_CFLAGS): + * makefile.w32-in (LOCAL_FLAGS): Remove -DHAVE_CONFIG_H. + * etags.c, hexl.c, pop.c: Include unconditionally. + * etags.c (DOS_NT): + * pop.c (MAIL_USE_POP, h_errno): + Remove code that was conditioned on !HAVE_CONFIG_H. + 2012-06-25 Dmitry Antipov * etags.c (etags_strcasecmp, etags_strncasecmp): Define to diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index a325fc18aac..fe727c65730 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -169,12 +169,9 @@ LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \ ## Some systems define this to request special libraries. LIBS_SYSTEM = @LIBS_SYSTEM@ -# Those files shared with other GNU utilities need HAVE_CONFIG_H -# defined before they know they can take advantage of the information -# in ../src/config.h. BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - -DHAVE_CONFIG_H -I. -I../src -I../lib \ + -I. -I../src -I../lib \ -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} diff --git a/lib-src/etags.c b/lib-src/etags.c index f44c1c05393..2e05e37e80f 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -91,9 +91,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4"; # define NDEBUG /* disable assert */ #endif -#ifdef HAVE_CONFIG_H -# include -#endif /* !HAVE_CONFIG_H */ +#include #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 /* enables some compiler checks on GNU */ @@ -113,10 +111,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4"; # include # include # include -# ifndef HAVE_CONFIG_H -# define DOS_NT -# include -# endif #else # define MSDOS FALSE #endif /* MSDOS */ @@ -167,14 +161,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4"; # include #endif /* NO_LONG_OPTIONS */ -#ifndef HAVE_CONFIG_H /* this is a standalone compilation */ -# ifdef __CYGWIN__ /* compiling on Cygwin */ - !!! NOTICE !!! - the regex.h distributed with Cygwin is not compatible with etags, alas! -If you want regular expression support, you should delete this notice and - arrange to use the GNU regex.h and regex.c. -# endif -#endif #include /* Define CTAGS to make the program "ctags" compatible with the usual one. diff --git a/lib-src/hexl.c b/lib-src/hexl.c index d418eca78c2..08da0075269 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c @@ -20,9 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index fea1d29592e..f1f42bccb68 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -24,7 +24,7 @@ ALL = $(BLD)/test-distrib.exe $(BLD)/make-docfile.exe $(BLD)/hexl.exe\ .PHONY: make-docfile LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \ - -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \ + -DNO_ARCHIVES=1 -I../lib \ -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS) LIBS = $(BASE_LIBS) $(ADVAPI32) diff --git a/lib-src/pop.c b/lib-src/pop.c index c4c7f2b4e2f..b8ed65c3eac 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -21,11 +21,7 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -#ifdef HAVE_CONFIG_H #include -#else -#define MAIL_USE_POP -#endif #ifdef MAIL_USE_POP @@ -101,7 +97,7 @@ extern char *krb_realmofhost (/* char * */); #endif /* KERBEROS */ #ifndef WINDOWSNT -#if !defined (HAVE_H_ERRNO) || !defined (HAVE_CONFIG_H) +#ifndef HAVE_H_ERRNO extern int h_errno; #endif #endif diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index b7ce6dd3b01..92fd7a81848 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -20,7 +20,7 @@ ALL = gnulib .PHONY: $(ALL) -LOCAL_FLAGS = -DHAVE_CONFIG_H=1 -I. -I../nt/inc -I../src +LOCAL_FLAGS = -I. -I../nt/inc -I../src LIBS = GNULIBOBJS = $(BLD)/dtoastr.$(O) \ diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 13b4b3bb351..7f87c5d8e6a 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,10 @@ +2012-06-26 Paul Eggert + + Clean out last vestiges of the old HAVE_CONFIG_H stuff. + * Makefile.in (ALL_CFLAGS): Remove -DHAVE_CONFIG_H. + * lwlib-Xaw.c, lwlib-Xlw.c, lwlib-Xm.c, lwlib-utils.c, lwlib.c: + * xlwmenu.c: Include unconditionally. + 2012-06-25 Dmitry Antipov * lwlib.c (my_strcasecmp): Rename to lwlib_strcasecmp, which diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index d43d9ca211e..d49f69b58a4 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -55,7 +55,7 @@ OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ $(C_SWITCH_MACHINE) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \ - -DHAVE_CONFIG_H -Demacs -I../src \ + -Demacs -I../src \ -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib .c.o: diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index 0a759e1a0a0..7f834df1aad 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c @@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include -#endif #include #include @@ -148,7 +146,7 @@ get_text_width_and_height (Widget widget, char *text, { int w = 0, h = 0; char *bp = text; - + while (bp && *bp != '\0') { XGlyphInfo gi; @@ -227,16 +225,16 @@ find_xft_data (Widget widget) Widget parent = XtParent (widget); struct widget_xft_data *data = NULL; int nr; - while (parent && !inst) + while (parent && !inst) { inst = lw_get_widget_instance (parent); parent = XtParent (parent); } if (!inst || !inst->xft_data || !inst->xft_data[0].xft_font) return 0; - for (nr = 0; data == NULL && nr < inst->nr_xft_data; ++nr) + for (nr = 0; data == NULL && nr < inst->nr_xft_data; ++nr) { - if (inst->xft_data[nr].widget == widget) + if (inst->xft_data[nr].widget == widget) data = &inst->xft_data[nr]; } @@ -250,7 +248,7 @@ command_press (Widget widget, Cardinal *num_params) { struct widget_xft_data *data = find_xft_data (widget); - if (data) + if (data) { char *lbl; /* Since this isn't used for rectangle buttons, use it to for armed. */ @@ -268,11 +266,11 @@ command_reset (Widget widget, Cardinal *num_params) { struct widget_xft_data *data = find_xft_data (widget); - if (data) + if (data) { Dimension cr; XtVaGetValues (widget, XtNcornerRoundPercent, &cr, NULL); - if (cr == 1) + if (cr == 1) { char *lbl; XtVaSetValues (widget, XtNcornerRoundPercent, 0, NULL); @@ -366,14 +364,14 @@ void xaw_destroy_instance (widget_instance *instance) { #ifdef HAVE_XFT - if (instance->xft_data) + if (instance->xft_data) { int i; - for (i = 0; i < instance->nr_xft_data; ++i) + for (i = 0; i < instance->nr_xft_data; ++i) { if (instance->xft_data[i].xft_draw) XftDrawDestroy (instance->xft_data[i].xft_draw); - if (instance->xft_data[i].p != None) + if (instance->xft_data[i].p != None) { XtVaSetValues (instance->xft_data[i].widget, XtNbitmap, None, NULL); @@ -483,7 +481,7 @@ static XtActionsRec xaw_actions [] = { static Boolean actions_initted = False; #ifdef HAVE_XFT -static XtActionsRec button_actions[] = +static XtActionsRec button_actions[] = { { "my_reset", command_reset }, { "my_press", command_press }, @@ -563,7 +561,7 @@ make_dialog (char* name, XtVaGetValues (dialog, XtNnumChildren, &num, XtNchildren, &ch, NULL); - for (i = 0; i < num; ++i) + for (i = 0; i < num; ++i) { if (!XtIsSubclass (ch[i], commandWidgetClass) && XtIsSubclass (ch[i], labelWidgetClass)) @@ -574,9 +572,9 @@ make_dialog (char* name, } instance->xft_data = 0; instance->nr_xft_data = 0; - if (w) + if (w) { - XtResource rec[] = + XtResource rec[] = { { "font", "Font", XtRString, sizeof(String), 0, XtRString, (XtPointer)"Sans-10" }}; char *fontName = NULL; @@ -590,8 +588,8 @@ make_dialog (char* name, else XFreeFont (XtDisplay (dialog), xfn); } - - if (xft_font) + + if (xft_font) { instance->nr_xft_data = left_buttons + right_buttons + 1; instance->xft_data = calloc (instance->nr_xft_data, @@ -639,7 +637,7 @@ make_dialog (char* name, { ac = 0; XtSetArg (av [ac], XtNfromHoriz, button); ac++; - if (i == 0) + if (i == 0) { /* Separator to the other buttons. */ XtSetArg (av [ac], XtNhorizDistance, 30); ac++; diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index a4467900f8c..e8c59905ab9 100644 --- a/lwlib/lwlib-Xlw.c +++ b/lwlib/lwlib-Xlw.c @@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 4f6276850a3..acd11aec6b5 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c index 9286691639f..65cda72fdd8 100644 --- a/lwlib/lwlib-utils.c +++ b/lwlib/lwlib-utils.c @@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index d1686ecd048..d436b18d222 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 31e041d3dad..e8831c37f8f 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -22,9 +22,7 @@ Boston, MA 02110-1301, USA. */ /* Created by devin@lucid.com */ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 2b981168fea..1e156563e06 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,8 @@ +2012-06-26 Paul Eggert + + Clean out last vestiges of the old HAVE_CONFIG_H stuff. + * sedlibmk.inp (DEFS): Don't add -DHAVE_CONFIG_H. + 2012-06-11 Glenn Morris * sed2v2.inp (SYSTEM_TYPE): Set it. diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index e4dd5c5299b..31335e1e8c6 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -136,7 +136,7 @@ am__cd = cd /^GNULIB_WARN_CFLAGS *=/s/@GNULIB_WARN_CFLAGS@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// -/^DEFS *=/s/@[^@\n]*@/-DHAVE_CONFIG_H/ +/^DEFS *=/s/@[^@\n]*@// /^DEPDIR *=/s/@[^@\n]*@/deps/ /^DEPFLAGS *=/s/@[^@\n]*@/-MMD -MF ${DEPDIR}\/$*.d/ /^ECHO_N *=/s/@[^@\n]*@/-n/ 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 + + 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 unconditionally. + 2012-06-25 Dmitry Antipov * 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 -#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 -#endif +#include #include