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 <netinet/in.h> twice.
* ralloc.c: Don't include <unistd.h> 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 478e2bdf37a41161642ec86dc32a7a5d48811dce..d42f5733ce63cb3d89706e43ed912ad7b9cf006b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2013-07-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+       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 <netinet/in.h> twice.
+       * ralloc.c: Don't include <unistd.h> 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  <eggert@cs.ucla.edu>
 
        Scale ImageMagick images more carefully.

diff --git a/src/alloc.c b/src/alloc.c
index b625e1f27e094ae91be88d6e40b7c54f35b70724..a31a176caa72c1e00dfd5806012ab28ddd1b4448 100644 (file)
--- 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 <stdio.h>             /* 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 ad670e0a12184970c144983f0e026227dd164820..64b1bce9b0074fba16f246f889ed584671a3dc57 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4603,7 +4603,6 @@ evaporate_overlays (ptrdiff_t pos)
 
 #ifdef USE_MMAP_FOR_BUFFERS
 
-#include <sys/types.h>
 #include <sys/mman.h>
 
 #ifndef MAP_ANON
@@ -4618,8 +4617,6 @@ evaporate_overlays (ptrdiff_t pos)
 #define MAP_FAILED ((void *) -1)
 #endif
 
-#include <stdio.h>
-
 #if MAP_ANON == 0
 #include <fcntl.h>
 #endif

diff --git a/src/fileio.c b/src/fileio.c
index 3bfea20888ea634099693c311da0f33dceb52772..0ba7f85da2c10ada1068f9c61077e794b9afb0e9 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -55,7 +55,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef WINDOWSNT
 #define NOMINMAX 1
 #include <windows.h>
-#include <fcntl.h>
 #include <sys/file.h>
 #include "w32.h"
 #endif /* not WINDOWSNT */
@@ -63,7 +62,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef MSDOS
 #include "msdos.h"
 #include <sys/param.h>
-#include <fcntl.h>
 #endif
 
 #ifdef DOS_NT

diff --git a/src/lread.c b/src/lread.c
index b57665e365ce302a1cf62920c41362204c326e76..5f7b2cbdbe284e5c8a15476d55d9ec329bdac52d 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -38,7 +38,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 49ede8f483c8094368aae147b8243ab1ae0457c2..a657d01dbe45fde48a139aebe723bbd8fcf9546c 100644 (file)
--- 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 9961697e67158367c0fdd05cbee0a0cd7799e225..b77fb97168aef6c16c77def00457f43e5805851a 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -78,7 +78,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #ifdef HAVE_RES_INIT
-#include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
 #endif

diff --git a/src/ralloc.c b/src/ralloc.c
index 13fd65cbb0c1055daee3ca2c1c9ac40319d24f57..5f25ef2c320004718668cb78c960a29f40e7a294 100644 (file)
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -43,8 +43,6 @@ extern size_t __malloc_extra_blocks;
 #else /* not emacs */
 
 #include <stddef.h>
-
-#include <unistd.h>
 #include <malloc.h>
 
 #endif /* not emacs */

diff --git a/src/xdisp.c b/src/xdisp.c
index b61b976a40102462b19c7e87b8a9ea6b6dd3072e..ec1dbc454f66115468926d636bf6931c954d8b9a 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -313,8 +313,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 b2ace1be14ee4e54840a7ce2a7541bd51c99354d..0c627d7f9ee7449ac76bd53f904051d3d3bb744b 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -203,7 +203,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <stdio.h>              /* This needs to be before termchar.h */
 
 #include "lisp.h"
 #include "character.h"

diff --git a/src/xterm.c b/src/xterm.c
index 9c868aec392f7e13e988baa343678bf391acd2a1..f0b95d585e3ec354ba244c8f6cbea860e17ffb4b 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -69,7 +69,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 4a5ebc663703b4f1dfa2bce61ed6d675a80ed0a1..5415a77cf5823be3a375cf5e0ff4200cde0066ba 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -38,8 +38,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <X11/CoreP.h>         /* foul, but we need this to use our own
                                   window inside a widget instead of one
                                   that Xt creates... */
-#include <X11/StringDefs.h>
-
 typedef Widget xt_or_gtk_widget;
 #endif