[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113292: Remove duplicate #include directives.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r113292: Remove duplicate #include directives. |
Date: |
Fri, 05 Jul 2013 16:58:13 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113292
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2013-07-05 09:58:01 -0700
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/alloc.c alloc.c-20091113204419-o5vbwnq5f7feedwu-252
src/buffer.c buffer.c-20091113204419-o5vbwnq5f7feedwu-264
src/fileio.c fileio.c-20091113204419-o5vbwnq5f7feedwu-210
src/lread.c lread.c-20091113204419-o5vbwnq5f7feedwu-266
src/nsfont.m nsfont.m-20091113204419-o5vbwnq5f7feedwu-8748
src/process.c process.c-20091113204419-o5vbwnq5f7feedwu-462
src/ralloc.c ralloc.c-20091113204419-o5vbwnq5f7feedwu-157
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
src/xfaces.c xfaces.c-20091113204419-o5vbwnq5f7feedwu-560
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
src/xterm.h xterm.h-20091113204419-o5vbwnq5f7feedwu-228
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-07-04 15:25:54 +0000
+++ b/src/ChangeLog 2013-07-05 16:58:01 +0000
@@ -1,3 +1,20 @@
+2013-07-05 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
Scale ImageMagick images more carefully.
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2013-07-02 03:41:16 +0000
+++ b/src/alloc.c 2013-07-05 16:58:01 +0000
@@ -247,10 +247,6 @@
#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). */
=== modified file 'src/buffer.c'
--- a/src/buffer.c 2013-06-30 22:29:23 +0000
+++ b/src/buffer.c 2013-07-05 16:58:01 +0000
@@ -4603,7 +4603,6 @@
#ifdef USE_MMAP_FOR_BUFFERS
-#include <sys/types.h>
#include <sys/mman.h>
#ifndef MAP_ANON
@@ -4618,8 +4617,6 @@
#define MAP_FAILED ((void *) -1)
#endif
-#include <stdio.h>
-
#if MAP_ANON == 0
#include <fcntl.h>
#endif
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2013-07-04 09:29:28 +0000
+++ b/src/fileio.c 2013-07-05 16:58:01 +0000
@@ -55,7 +55,6 @@
#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 @@
#ifdef MSDOS
#include "msdos.h"
#include <sys/param.h>
-#include <fcntl.h>
#endif
#ifdef DOS_NT
=== modified file 'src/lread.c'
--- a/src/lread.c 2013-06-13 22:24:52 +0000
+++ b/src/lread.c 2013-07-05 16:58:01 +0000
@@ -38,7 +38,6 @@
#include "keyboard.h"
#include "frame.h"
#include "termhooks.h"
-#include "coding.h"
#include "blockinput.h"
#ifdef MSDOS
=== modified file 'src/nsfont.m'
--- a/src/nsfont.m 2013-06-17 21:10:31 +0000
+++ b/src/nsfont.m 2013-07-05 16:58:01 +0000
@@ -33,7 +33,6 @@
#include "window.h"
#include "fontset.h"
#include "nsterm.h"
-#include "frame.h"
#include "character.h"
#include "font.h"
#include "termchar.h"
=== modified file 'src/process.c'
--- a/src/process.c 2013-07-02 12:46:43 +0000
+++ b/src/process.c 2013-07-05 16:58:01 +0000
@@ -78,7 +78,6 @@
#endif
#ifdef HAVE_RES_INIT
-#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>
#endif
=== modified file 'src/ralloc.c'
--- a/src/ralloc.c 2013-02-22 19:23:12 +0000
+++ b/src/ralloc.c 2013-07-05 16:58:01 +0000
@@ -43,8 +43,6 @@
#else /* not emacs */
#include <stddef.h>
-
-#include <unistd.h>
#include <malloc.h>
#endif /* not emacs */
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2013-07-02 15:52:07 +0000
+++ b/src/xdisp.c 2013-07-05 16:58:01 +0000
@@ -313,8 +313,6 @@
#include "gtkutil.h"
#endif
-#include "font.h"
-
#ifndef FRAME_X_OUTPUT
#define FRAME_X_OUTPUT(f) ((f)->output_data.x)
#endif
=== modified file 'src/xfaces.c'
--- a/src/xfaces.c 2013-04-07 04:41:19 +0000
+++ b/src/xfaces.c 2013-07-05 16:58:01 +0000
@@ -203,7 +203,6 @@
#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"
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2013-06-30 15:24:14 +0000
+++ b/src/xterm.c 2013-07-05 16:58:01 +0000
@@ -69,7 +69,6 @@
#include "atimer.h"
#include "keymap.h"
#include "font.h"
-#include "fontset.h"
#include "xsettings.h"
#include "xgselect.h"
#include "sysselect.h"
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2013-05-09 14:49:56 +0000
+++ b/src/xterm.h 2013-07-05 16:58:01 +0000
@@ -38,8 +38,6 @@
#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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113292: Remove duplicate #include directives.,
Paul Eggert <=