[7/7,v2] Tidy #include lists

Message ID 53E1F642.70207@codesourcery.com
State Committed
Headers

Commit Message

Yao Qi Aug. 6, 2014, 9:32 a.m. UTC
  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?
  

Comments

Gary Benson Aug. 6, 2014, 10:19 a.m. UTC | #1
Yao Qi wrote:
> File x86-linux-nat.h is included twice in amd64-linux-nat.c and
> i386-linux-nat.c.  This patch is to remove one.

Thanks Yao.  Please commit this as obvious.

Cheers,
Gary
  
Yao Qi Aug. 6, 2014, 11:12 a.m. UTC | #2
On 08/06/2014 06:19 PM, Gary Benson wrote:
> Thanks Yao.  Please commit this as obvious.

Sure, patch is pushed in.
  

Patch

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"