From 08a494a3b08c63fdd45130d460f5f7d9f8f9396b Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Tue, 1 Jun 2010 21:29:53 -0700 Subject: [PATCH] Fix config.h includes. * src/xsettings.c: * src/xgselect.c: * src/nsterm.m: * src/nsselect.m: * src/nsimage.m: * src/nsfont.m: * src/nsfns.m: * src/dbusbind.c: Use #include instead of "config.h" as all other files do. --- src/ChangeLog | 11 +++++++++++ src/dbusbind.c | 2 +- src/nsfns.m | 2 +- src/nsfont.m | 2 +- src/nsimage.m | 2 +- src/nsselect.m | 2 +- src/nsterm.m | 2 +- src/xgselect.c | 2 +- src/xsettings.c | 2 +- 9 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c641043e400..44807660415 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,16 @@ 2010-06-02 Dan Nicolaescu + Fix config.h includes. + * xsettings.c: + * xgselect.c: + * nsterm.m: + * nsselect.m: + * nsimage.m: + * nsfont.m: + * nsfns.m: + * dbusbind.c: Use #include instead of "config.h" as all + other files do. + * gmalloc.c: Remove BROKEN_PROTOTYPES reference, unused. * s/sol2-6.h: Remove obsolete comments. diff --git a/src/dbusbind.c b/src/dbusbind.c index 5cad182b525..a72a95552bc 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -#include "config.h" +#include #ifdef HAVE_DBUS #include diff --git a/src/nsfns.m b/src/nsfns.m index 7e7fd48caf0..53264a5f595 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -27,7 +27,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) /* This should be the first include, as it may set up #defines affecting interpretation of even the system includes. */ -#include "config.h" +#include #include #include diff --git a/src/nsfont.m b/src/nsfont.m index 59d5ee73db1..db2399a7fa0 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -22,7 +22,7 @@ Author: Adrian Robert (arobert@cogsci.ucsd.edu) /* This should be the first include, as it may set up #defines affecting interpretation of even the system includes. */ -#include "config.h" +#include #include #include "lisp.h" diff --git a/src/nsimage.m b/src/nsimage.m index 09a78e20809..3e6a8c77ed7 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -27,7 +27,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) /* This should be the first include, as it may set up #defines affecting interpretation of even the system includes. */ -#include "config.h" +#include #include #include "lisp.h" diff --git a/src/nsselect.m b/src/nsselect.m index e4f5f0c613e..b034eacf77c 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -27,7 +27,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) /* This should be the first include, as it may set up #defines affecting interpretation of even the system includes. */ -#include "config.h" +#include #include #include "lisp.h" diff --git a/src/nsterm.m b/src/nsterm.m index 7bc82e96104..14b824057da 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -27,7 +27,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) /* This should be the first include, as it may set up #defines affecting interpretation of even the system includes. */ -#include "config.h" +#include #include #include diff --git a/src/xgselect.c b/src/xgselect.c index d93c1bdf405..42fff2d98da 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -#include "config.h" +#include #if defined (USE_GTK) || defined (HAVE_GCONF) #include diff --git a/src/xsettings.c b/src/xsettings.c index f1b4c8c9b23..8cfcafe126d 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -#include "config.h" +#include #include #include #include -- 2.39.2