Remove redundant include directives.

stdint.h was added to common-defs.h some months ago and should
no longer be included directly by any file.

gdb_assert.h was added to common-defs.h nearly a year ago, but
three includes have crept in since then.

This commit removes all such redundant include directives.

gdb/ChangeLog:

	* common/buffer.c (stdint.h): Do not include.
	* common/print-utils.c (stdint.h): Likewise.
	* compile/compile-c-symbols.c (gdb_assert.h): Likewise.
	* compile/compile-c-types.c (gdb_assert.h): Likewise.
	* ft32-tdep.c (gdb_assert.h): Likewise.
	* guile/scm-utils.c (stdint.h): Likewise.
	* i386-linux-tdep.c (stdint.h): Likewise.
	* i386-tdep.c (stdint.h): Likewise.
	* nat/linux-btrace.c (stdint.h): Likewise.
	* nat/linux-btrace.h (stdint.h): Likewise.
	* nat/linux-ptrace.c (stdint.h): Likewise.
	* nat/mips-linux-watch.h (stdint.h): Likewise.
	* ppc-linux-nat.c (stdint.h): Likewise.
	* python/python-internal.h (stdint.h): Likewise.
	* stub-termcap.c (stdlib.h): Likewise.
	* target/target.h (stdint.h): Likewise.
	* xtensa-linux-nat.c (stdint.h): Likewise.

gdb/gdbserver/ChangeLog:

	* linux-i386-ipa.c (stdint.h): Do not include.
	* lynx-i386-low.c (stdint.h): Likewise.
	* lynx-ppc-low.c (stdint.h): Likewise.
	* mem-break.c (stdint.h): Likewise.
	* thread-db.c (stdint.h): Likewise.
	* tracepoint.c (stdint.h): Likewise.
	* win32-low.c (stdint.h): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 99ff2fb..0d0fe10 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,23 @@
+2015-06-24  Gary Benson  <gbenson@redhat.com>
+
+       * common/buffer.c (stdint.h): Do not include.
+       * common/print-utils.c (stdint.h): Likewise.
+       * compile/compile-c-symbols.c (gdb_assert.h): Likewise.
+       * compile/compile-c-types.c (gdb_assert.h): Likewise.
+       * ft32-tdep.c (gdb_assert.h): Likewise.
+       * guile/scm-utils.c (stdint.h): Likewise.
+       * i386-linux-tdep.c (stdint.h): Likewise.
+       * i386-tdep.c (stdint.h): Likewise.
+       * nat/linux-btrace.c (stdint.h): Likewise.
+       * nat/linux-btrace.h (stdint.h): Likewise.
+       * nat/linux-ptrace.c (stdint.h): Likewise.
+       * nat/mips-linux-watch.h (stdint.h): Likewise.
+       * ppc-linux-nat.c (stdint.h): Likewise.
+       * python/python-internal.h (stdint.h): Likewise.
+       * stub-termcap.c (stdlib.h): Likewise.
+       * target/target.h (stdint.h): Likewise.
+       * xtensa-linux-nat.c (stdint.h): Likewise.
+

 2015-06-23  Patrick Palka  <patrick@parcs.ath.cx>
 
        * top.c (init_history): Look at errno after calling strtol to
 2015-06-23  Patrick Palka  <patrick@parcs.ath.cx>
 
        * top.c (init_history): Look at errno after calling strtol to

diff --git a/gdb/common/buffer.c b/gdb/common/buffer.c
index 28b2625..ca1636d 100644 (file)
--- a/gdb/common/buffer.c
+++ b/gdb/common/buffer.c
@@ -21,8 +21,6 @@
 #include "xml-utils.h"
 #include "buffer.h"
 #include "inttypes.h"
 #include "xml-utils.h"
 #include "buffer.h"
 #include "inttypes.h"

-#include <stdint.h>
-

 void
 buffer_grow (struct buffer *buffer, const char *data, size_t size)
 {
 void
 buffer_grow (struct buffer *buffer, const char *data, size_t size)
 {

diff --git a/gdb/common/print-utils.c b/gdb/common/print-utils.c
index c8ff133..1c1a5c1 100644 (file)
--- a/gdb/common/print-utils.c
+++ b/gdb/common/print-utils.c
@@ -19,8 +19,6 @@
 
 #include "common-defs.h"
 #include "print-utils.h"
 
 #include "common-defs.h"
 #include "print-utils.h"

-#include <stdint.h>
-

 /* Temporary storage using circular buffer.  */
 
 #define NUMCELLS 16
 /* Temporary storage using circular buffer.  */
 
 #define NUMCELLS 16

diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c
index 455114c..68d38ba 100644 (file)
--- a/gdb/compile/compile-c-symbols.c
+++ b/gdb/compile/compile-c-symbols.c
@@ -20,7 +20,6 @@
 
 #include "defs.h"
 #include "compile-internal.h"
 
 #include "defs.h"
 #include "compile-internal.h"

-#include "gdb_assert.h"

 #include "symtab.h"
 #include "parser-defs.h"
 #include "block.h"
 #include "symtab.h"
 #include "parser-defs.h"
 #include "block.h"

diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
index 2b521bc..22f5a9d 100644 (file)
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -21,8 +21,6 @@
 #include "defs.h"
 #include "gdbtypes.h"
 #include "compile-internal.h"
 #include "defs.h"
 #include "gdbtypes.h"
 #include "compile-internal.h"

-#include "gdb_assert.h"
-

 /* An object that maps a gdb type to a gcc type.  */
 
 struct type_map_instance
 /* An object that maps a gdb type to a gcc type.  */
 
 struct type_map_instance

diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index 41a7191..e7f4d1a 100644 (file)
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -37,8 +37,6 @@
 #include "dis-asm.h"
 #include "record.h"
 
 #include "dis-asm.h"
 #include "record.h"
 

-#include "gdb_assert.h"
-

 #include "ft32-tdep.h"
 #include "gdb/sim-ft32.h"
 
 #include "ft32-tdep.h"
 #include "gdb/sim-ft32.h"
 

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 7c380c1..2528f0f 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,13 @@
+2015-06-24  Gary Benson  <gbenson@redhat.com>
+
+       * linux-i386-ipa.c (stdint.h): Do not include.
+       * lynx-i386-low.c (stdint.h): Likewise.
+       * lynx-ppc-low.c (stdint.h): Likewise.
+       * mem-break.c (stdint.h): Likewise.
+       * thread-db.c (stdint.h): Likewise.
+       * tracepoint.c (stdint.h): Likewise.
+       * win32-low.c (stdint.h): Likewise.
+

 2015-06-18  Simon Marchi  <simon.marchi@ericsson.com>
 
        * server.c (write_qxfer_response): Update call to
 2015-06-18  Simon Marchi  <simon.marchi@ericsson.com>
 
        * server.c (write_qxfer_response): Update call to

diff --git a/gdb/gdbserver/linux-i386-ipa.c b/gdb/gdbserver/linux-i386-ipa.c
index eb30dcd..de8d394 100644 (file)
--- a/gdb/gdbserver/linux-i386-ipa.c
+++ b/gdb/gdbserver/linux-i386-ipa.c
@@ -19,7 +19,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"

-#include <stdint.h>

 #include <sys/mman.h>
 #include "tracepoint.h"
 
 #include <sys/mman.h>
 #include "tracepoint.h"
 

diff --git a/gdb/gdbserver/lynx-i386-low.c b/gdb/gdbserver/lynx-i386-low.c
index bd588c6..6b5a224 100644 (file)
--- a/gdb/gdbserver/lynx-i386-low.c
+++ b/gdb/gdbserver/lynx-i386-low.c
@@ -17,8 +17,6 @@
 
 #include "server.h"
 #include "lynx-low.h"
 
 #include "server.h"
 #include "lynx-low.h"

-
-#include <stdint.h>

 #include <limits.h>
 #include <sys/ptrace.h>
 
 #include <limits.h>
 #include <sys/ptrace.h>
 

diff --git a/gdb/gdbserver/lynx-ppc-low.c b/gdb/gdbserver/lynx-ppc-low.c
index 51d450f..0f31eaf 100644 (file)
--- a/gdb/gdbserver/lynx-ppc-low.c
+++ b/gdb/gdbserver/lynx-ppc-low.c
@@ -17,8 +17,6 @@
 
 #include "server.h"
 #include "lynx-low.h"
 
 #include "server.h"
 #include "lynx-low.h"

-
-#include <stdint.h>

 #include <limits.h>
 #include <sys/ptrace.h>
 
 #include <limits.h>
 #include <sys/ptrace.h>
 

diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c
index d1b66bf..4eaa52b 100644 (file)
--- a/gdb/gdbserver/mem-break.c
+++ b/gdb/gdbserver/mem-break.c
@@ -21,8 +21,6 @@
 #include "server.h"
 #include "regcache.h"
 #include "ax.h"
 #include "server.h"
 #include "regcache.h"
 #include "ax.h"

-#include <stdint.h>
-

 const unsigned char *breakpoint_data;
 int breakpoint_len;
 
 const unsigned char *breakpoint_data;
 int breakpoint_len;
 

diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c
index 5bf808e..4288fdb 100644 (file)
--- a/gdb/gdbserver/thread-db.c
+++ b/gdb/gdbserver/thread-db.c
@@ -34,8 +34,6 @@ static int thread_db_use_events;
 #ifndef USE_LIBTHREAD_DB_DIRECTLY
 #include <dlfcn.h>
 #endif
 #ifndef USE_LIBTHREAD_DB_DIRECTLY
 #include <dlfcn.h>
 #endif

-
-#include <stdint.h>

 #include <limits.h>
 #include <ctype.h>
 
 #include <limits.h>
 #include <ctype.h>
 

diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 3ce9580..b5f252a 100644 (file)
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -27,8 +27,6 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <inttypes.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <inttypes.h>

-#include <stdint.h>
-

 #include "ax.h"
 #include "tdesc.h"
 
 #include "ax.h"
 #include "tdesc.h"
 

diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index 699115c..64caf24 100644 (file)
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -26,8 +26,6 @@
 #include "gdbthread.h"
 #include "dll.h"
 #include "hostio.h"
 #include "gdbthread.h"
 #include "dll.h"
 #include "hostio.h"

-
-#include <stdint.h>

 #include <windows.h>
 #include <winnt.h>
 #include <imagehlp.h>
 #include <windows.h>
 #include <winnt.h>
 #include <imagehlp.h>

diff --git a/gdb/guile/scm-utils.c b/gdb/guile/scm-utils.c
index 59d8b52..07401e6 100644 (file)
--- a/gdb/guile/scm-utils.c
+++ b/gdb/guile/scm-utils.c
@@ -21,7 +21,6 @@
    conventions, et.al.  */
 
 #include "defs.h"
    conventions, et.al.  */
 
 #include "defs.h"

-#include <stdint.h>

 #include "guile-internal.h"
 
 /* Define VARIABLES in the gdb module.  */
 #include "guile-internal.h"
 
 /* Define VARIABLES in the gdb module.  */

diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 061ad3a..7c2e322 100644 (file)
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -44,8 +44,6 @@
 
 #include "record-full.h"
 #include "linux-record.h"
 
 #include "record-full.h"
 #include "linux-record.h"

-#include <stdint.h>
-

 #include "features/i386/i386-linux.c"
 #include "features/i386/i386-mmx-linux.c"
 #include "features/i386/i386-mpx-linux.c"
 #include "features/i386/i386-linux.c"
 #include "features/i386/i386-mmx-linux.c"
 #include "features/i386/i386-mpx-linux.c"

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 42d0346..85e433e 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -50,8 +50,6 @@
 
 #include "record.h"
 #include "record-full.h"
 
 #include "record.h"
 #include "record-full.h"

-#include <stdint.h>
-

 #include "features/i386/i386.c"
 #include "features/i386/i386-avx.c"
 #include "features/i386/i386-mpx.c"
 #include "features/i386/i386.c"
 #include "features/i386/i386-avx.c"
 #include "features/i386/i386-mpx.c"

diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index e7aff5e..cd7f3d1 100644 (file)
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -30,8 +30,6 @@
 #endif
 
 #if HAVE_LINUX_PERF_EVENT_H && defined(SYS_perf_event_open)
 #endif
 
 #if HAVE_LINUX_PERF_EVENT_H && defined(SYS_perf_event_open)

-
-#include <stdint.h>

 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/user.h>
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/user.h>

diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
index 12cdcde..bb4a8c5 100644 (file)
--- a/gdb/nat/linux-btrace.h
+++ b/gdb/nat/linux-btrace.h
@@ -24,8 +24,6 @@
 
 #include "btrace-common.h"
 #include "vec.h"
 
 #include "btrace-common.h"
 #include "vec.h"

-#include <stdint.h>
-

 #if HAVE_LINUX_PERF_EVENT_H
 #  include <linux/perf_event.h>
 #endif
 #if HAVE_LINUX_PERF_EVENT_H
 #  include <linux/perf_event.h>
 #endif

diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index fb12606..1a926f9 100644 (file)
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -23,8 +23,6 @@
 #include "buffer.h"
 #include "gdb_wait.h"
 
 #include "buffer.h"
 #include "gdb_wait.h"
 

-#include <stdint.h>
-

 /* Stores the ptrace options supported by the running kernel.
    A value of -1 means we did not check for features yet.  A value
    of 0 means there are no supported features.  */
 /* Stores the ptrace options supported by the running kernel.
    A value of -1 means we did not check for features yet.  A value
    of 0 means there are no supported features.  */

diff --git a/gdb/nat/mips-linux-watch.h b/gdb/nat/mips-linux-watch.h
index 571cde4..10ed6ba 100644 (file)
--- a/gdb/nat/mips-linux-watch.h
+++ b/gdb/nat/mips-linux-watch.h
@@ -19,8 +19,6 @@
 #define MIPS_LINUX_WATCH_H 1
 
 #include <asm/ptrace.h>
 #define MIPS_LINUX_WATCH_H 1
 
 #include <asm/ptrace.h>

-#include <stdint.h>
-

 #include "break-common.h"
 
 #define MAX_DEBUG_REGISTER 8
 #include "break-common.h"
 
 #define MAX_DEBUG_REGISTER 8

diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 88ca49e..4ed03d0 100644 (file)
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -26,8 +26,6 @@
 #include "regcache.h"
 #include "target.h"
 #include "linux-nat.h"
 #include "regcache.h"
 #include "target.h"
 #include "linux-nat.h"

-
-#include <stdint.h>

 #include <sys/types.h>
 #include <signal.h>
 #include <sys/user.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <sys/user.h>

diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index f881559..ee949b7 100644 (file)
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -65,8 +65,6 @@
 
 /* Python 2.4 doesn't include stdint.h soon enough to get {u,}intptr_t
    needed by pyport.h.  */
 
 /* Python 2.4 doesn't include stdint.h soon enough to get {u,}intptr_t
    needed by pyport.h.  */

-#include <stdint.h>
-

 /* /usr/include/features.h on linux systems will define _POSIX_C_SOURCE
    if it sees _GNU_SOURCE (which config.h will define).
    pyconfig.h defines _POSIX_C_SOURCE to a different value than
 /* /usr/include/features.h on linux systems will define _POSIX_C_SOURCE
    if it sees _GNU_SOURCE (which config.h will define).
    pyconfig.h defines _POSIX_C_SOURCE to a different value than

diff --git a/gdb/stub-termcap.c b/gdb/stub-termcap.c
index 722929f..2ee1c04 100644 (file)
--- a/gdb/stub-termcap.c
+++ b/gdb/stub-termcap.c
@@ -22,8 +22,6 @@
 
 #include "defs.h"
 
 
 #include "defs.h"
 

-#include <stdlib.h>
-

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/gdb/target/target.h b/gdb/target/target.h
index 05ac758..6ee0fee 100644 (file)
--- a/gdb/target/target.h
+++ b/gdb/target/target.h
@@ -21,8 +21,6 @@
 #define TARGET_COMMON_H
 
 #include "target/waitstatus.h"
 #define TARGET_COMMON_H
 
 #include "target/waitstatus.h"

-#include <stdint.h>
-

 /* This header is a stopgap until more code is shared.  */
 
 /* Read LEN bytes of target memory at address MEMADDR, placing the
 /* This header is a stopgap until more code is shared.  */
 
 /* Read LEN bytes of target memory at address MEMADDR, placing the

diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
index 921bc99..fa62732 100644 (file)
--- a/gdb/xtensa-linux-nat.c
+++ b/gdb/xtensa-linux-nat.c
@@ -24,8 +24,6 @@
 #include "regcache.h"
 #include "target.h"
 #include "linux-nat.h"
 #include "regcache.h"
 #include "target.h"
 #include "linux-nat.h"

-
-#include <stdint.h>

 #include <sys/types.h>
 #include <signal.h>
 #include <sys/user.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <sys/user.h>