Re: [PATCH 7/7 v2] Tidy #include lists

[Yao Qi <yao@codesourcery.com>]

On 06/27/2014 10:12 PM, Gary Benson wrote:
> +#include "x86-linux-nat.h"

x86-linux-nat.h is included ....

>  #include "amd64-tdep.h"
> +#include "amd64-linux-tdep.h"
>  #include "i386-linux-tdep.h"
> -#include "amd64-nat.h"
> -#include "i386-nat.h"
>  #include "i386-xstate.h"
>  
>  #include "x86-linux-nat.h"

... here.  We can remove one of the two includes.

>  
> +#include "x86-linux-nat.h"
> +#include "i386-linux-nat.h"
>  #include "i387-tdep.h"
>  #include "i386-tdep.h"
>  #include "i386-linux-tdep.h"
> -
> -/* Defines ps_err_e, struct ps_prochandle.  */
> -#include "gdb_proc_service.h"
> -
>  #include "i386-xstate.h"
>  
>  #include "x86-linux-nat.h"

Likewise.  How about the patch below?

-- 
Yao (齐尧)

Subject: [PATCH] Remove duplicated include file

File x86-linux-nat.h is included twice in amd64-linux-nat.c and
i386-linux-nat.c.  This patch is to remove one.

gdb:

2014-08-06  Yao Qi  <yao@codesourcery.com>

	* amd64-linux-nat.c: Remove duplicated include
	"x86-linux-nat.h".
	* i386-linux-nat.c: Likewise.
---
 gdb/amd64-linux-nat.c | 1 -
 gdb/i386-linux-nat.c  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index 0885a0a..def12ee 100644
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -30,7 +30,6 @@

 #include "amd64-nat.h"
 #include "linux-nat.h"
-#include "x86-linux-nat.h"
 #include "amd64-tdep.h"
 #include "amd64-linux-tdep.h"
 #include "i386-linux-tdep.h"
diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
index bb0f2c8..8227d4a 100644
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -26,7 +26,6 @@
 #include "gregset.h"
 #include "gdb_proc_service.h"

-#include "x86-linux-nat.h"
 #include "i386-linux-nat.h"
 #include "i387-tdep.h"
 #include "i386-tdep.h"
-- 
1.9.0