From 47ba6d4383a3f5a590ccee6c456b41e721a2274c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 5 Jul 2013 09:58:01 -0700 Subject: [PATCH] Remove duplicate #include directives. * alloc.c [GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES]: * xfaces.c: Don't include stdio.h twice. * buffer.c [USE_MMAP_FOR_BUFFERS]: Don't include sys/types.h or stdio.h twice. * fileio.c [WINDOWSNT | MSDOS]: Don't include fcntl.h twice. * lread.c: Don't include coding.h twice. * nsfont.m: Don't include frame.h twice. * process.c [HAVE_RES_INIT]: Don't include twice. * ralloc.c: Don't include twice. * xdisp.c: Don't include font.h twice. * xterm.c: Don't include fontset.h twice. * xterm.h [USE_X_TOOLKIT]: Don't include X11/StringDefs.h twice. --- src/ChangeLog | 17 +++++++++++++++++ src/alloc.c | 4 ---- src/buffer.c | 3 --- src/fileio.c | 2 -- src/lread.c | 1 - src/nsfont.m | 1 - src/process.c | 1 - src/ralloc.c | 2 -- src/xdisp.c | 2 -- src/xfaces.c | 1 - src/xterm.c | 1 - src/xterm.h | 2 -- 12 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 478e2bdf37a..d42f5733ce6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,20 @@ +2013-07-05 Paul Eggert + + Remove duplicate #include directives. + * alloc.c [GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES]: + * xfaces.c: + Don't include stdio.h twice. + * buffer.c [USE_MMAP_FOR_BUFFERS]: + Don't include sys/types.h or stdio.h twice. + * fileio.c [WINDOWSNT | MSDOS]: Don't include fcntl.h twice. + * lread.c: Don't include coding.h twice. + * nsfont.m: Don't include frame.h twice. + * process.c [HAVE_RES_INIT]: Don't include twice. + * ralloc.c: Don't include twice. + * xdisp.c: Don't include font.h twice. + * xterm.c: Don't include fontset.h twice. + * xterm.h [USE_X_TOOLKIT]: Don't include X11/StringDefs.h twice. + 2013-07-04 Paul Eggert Scale ImageMagick images more carefully. diff --git a/src/alloc.c b/src/alloc.c index b625e1f27e0..a31a176caa7 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -247,10 +247,6 @@ enum mem_type #if GC_MARK_STACK || defined GC_MALLOC_CHECK -#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES -#include /* For fprintf. */ -#endif - /* A unique object in pure space used to make some Lisp objects on free lists recognizable in O(1). */ diff --git a/src/buffer.c b/src/buffer.c index ad670e0a121..64b1bce9b00 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4603,7 +4603,6 @@ evaporate_overlays (ptrdiff_t pos) #ifdef USE_MMAP_FOR_BUFFERS -#include #include #ifndef MAP_ANON @@ -4618,8 +4617,6 @@ evaporate_overlays (ptrdiff_t pos) #define MAP_FAILED ((void *) -1) #endif -#include - #if MAP_ANON == 0 #include #endif diff --git a/src/fileio.c b/src/fileio.c index 3bfea20888e..0ba7f85da2c 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -55,7 +55,6 @@ along with GNU Emacs. If not, see . */ #ifdef WINDOWSNT #define NOMINMAX 1 #include -#include #include #include "w32.h" #endif /* not WINDOWSNT */ @@ -63,7 +62,6 @@ along with GNU Emacs. If not, see . */ #ifdef MSDOS #include "msdos.h" #include -#include #endif #ifdef DOS_NT diff --git a/src/lread.c b/src/lread.c index b57665e365c..5f7b2cbdbe2 100644 --- a/src/lread.c +++ b/src/lread.c @@ -38,7 +38,6 @@ along with GNU Emacs. If not, see . */ #include "keyboard.h" #include "frame.h" #include "termhooks.h" -#include "coding.h" #include "blockinput.h" #ifdef MSDOS diff --git a/src/nsfont.m b/src/nsfont.m index 49ede8f483c..a657d01dbe4 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -33,7 +33,6 @@ Author: Adrian Robert (arobert@cogsci.ucsd.edu) #include "window.h" #include "fontset.h" #include "nsterm.h" -#include "frame.h" #include "character.h" #include "font.h" #include "termchar.h" diff --git a/src/process.c b/src/process.c index 9961697e671..b77fb97168a 100644 --- a/src/process.c +++ b/src/process.c @@ -78,7 +78,6 @@ along with GNU Emacs. If not, see . */ #endif #ifdef HAVE_RES_INIT -#include #include #include #endif diff --git a/src/ralloc.c b/src/ralloc.c index 13fd65cbb0c..5f25ef2c320 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -43,8 +43,6 @@ extern size_t __malloc_extra_blocks; #else /* not emacs */ #include - -#include #include #endif /* not emacs */ diff --git a/src/xdisp.c b/src/xdisp.c index b61b976a401..ec1dbc454f6 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -313,8 +313,6 @@ along with GNU Emacs. If not, see . */ #include "gtkutil.h" #endif -#include "font.h" - #ifndef FRAME_X_OUTPUT #define FRAME_X_OUTPUT(f) ((f)->output_data.x) #endif diff --git a/src/xfaces.c b/src/xfaces.c index b2ace1be14e..0c627d7f9ee 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -203,7 +203,6 @@ along with GNU Emacs. If not, see . */ #include #include #include -#include /* This needs to be before termchar.h */ #include "lisp.h" #include "character.h" diff --git a/src/xterm.c b/src/xterm.c index 9c868aec392..f0b95d585e3 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -69,7 +69,6 @@ along with GNU Emacs. If not, see . */ #include "atimer.h" #include "keymap.h" #include "font.h" -#include "fontset.h" #include "xsettings.h" #include "xgselect.h" #include "sysselect.h" diff --git a/src/xterm.h b/src/xterm.h index 4a5ebc66370..5415a77cf58 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -38,8 +38,6 @@ along with GNU Emacs. If not, see . */ #include /* foul, but we need this to use our own window inside a widget instead of one that Xt creates... */ -#include - typedef Widget xt_or_gtk_widget; #endif -- 2.39.2