From 73f838adaf4d7fa14af503a4786076aea7329bb1 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 3 Mar 2008 06:32:13 +0000 Subject: [PATCH] * w32term.c: Remove unused include "gnu.h". * makefile.w32-in (w32term.o): Don't depend on gnu.h * gnu.h: Rename to ... * emacs-icon.h: ... this. * xterm.c: Use emacs-icon.h instead of gnu.h. * Makefile (xterm.o): Depend on emacs-icon.h, not gnu.h. --- src/ChangeLog | 10 ++++++++++ src/Makefile.in | 4 ++-- src/{gnu.h => emacs-icon.h} | 0 src/makefile.w32-in | 1 - src/w32term.c | 1 - src/xterm.c | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) rename src/{gnu.h => emacs-icon.h} (100%) diff --git a/src/ChangeLog b/src/ChangeLog index 9f4fc1a5d42..c7874612c6d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2008-03-03 Dan Nicolaescu + + * w32term.c: Remove unused include "gnu.h". + * makefile.w32-in (w32term.o): Don't depend on gnu.h + + * gnu.h: Rename to ... + * emacs-icon.h: ... this. + * xterm.c: Use emacs-icon.h instead of gnu.h. + * Makefile (xterm.o): Depend on emacs-icon.h, not gnu.h. + 2008-03-03 Juanma Barranquero * w32font.c: Include math.h. diff --git a/src/Makefile.in b/src/Makefile.in index 6113e3e8e16..5a2a93ef292 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1205,7 +1205,7 @@ xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ systime.h gtkutil.h msdos.h coding.h $(config_h) xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \ - keyboard.h gnu.h character.h charset.h ccl.h fontset.h composite.h \ + keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \ coding.h process.h gtkutil.h $(FONTSRC) $(config_h) xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \ buffer.h atimer.h systime.h termhooks.h $(config_h) @@ -1267,7 +1267,7 @@ macmenu.o: macmenu.c termhooks.h frame.h window.h dispextern.h macgui.h \ keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h) macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \ frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ - termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ + termchar.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ process.h coding.h $(config_h) macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \ keymap.h $(config_h) diff --git a/src/gnu.h b/src/emacs-icon.h similarity index 100% rename from src/gnu.h rename to src/emacs-icon.h diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 1c12afa0168..14883fc5c90 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -1526,7 +1526,6 @@ $(BLD)/w32term.$(O): \ $(SRC)/font.h \ $(SRC)/fontset.h \ $(SRC)/frame.h \ - $(SRC)/gnu.h \ $(SRC)/intervals.h \ $(SRC)/keyboard.h \ $(SRC)/keymap.h \ diff --git a/src/w32term.c b/src/w32term.c index 25ecccfd6ba..944c0f9fa43 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -46,7 +46,6 @@ Boston, MA 02110-1301, USA. */ #include "termhooks.h" #include "termopts.h" #include "termchar.h" -#include "gnu.h" #include "disptab.h" #include "buffer.h" #include "window.h" diff --git a/src/xterm.c b/src/xterm.c index 55582b5c10d..5496dbaca32 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -77,7 +77,7 @@ Boston, MA 02110-1301, USA. */ #include "termhooks.h" #include "termopts.h" #include "termchar.h" -#include "gnu.h" +#include "emacs-icon.h" #include "disptab.h" #include "buffer.h" #include "window.h" -- 2.39.2