From 1db7ec42dec38c28139f12fb3d44b44603ea78e5 Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Tue, 12 Jul 2011 11:59:11 +0000
Subject: [PATCH] Fix Linux build breakage caused by header rearrangement in
 r11885, sigh.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11886
---
 coregrind/vgdb.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c
index 065821bf19..1d74708da2 100644
--- a/coregrind/vgdb.c
+++ b/coregrind/vgdb.c
@@ -41,8 +41,13 @@ int main (int argc, char** argv)
 
 #else /* all other (Linux?) platforms */
 
+#include "pub_core_basics.h"
+#include "pub_core_vki.h"
+#include "pub_core_libcsetjmp.h"
+#include "pub_core_threadstate.h"
+#include "pub_core_gdbserver.h"
+
 #include <limits.h>
-#include <unistd.h>
 #include <string.h>
 #include <poll.h>
 #include <pthread.h>
@@ -53,11 +58,10 @@ int main (int argc, char** argv)
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <signal.h>
 #include <sys/mman.h>
 #include <sys/ptrace.h>
 #include <sys/wait.h>
-#include "assert.h"
+#include <assert.h>
 #include <sys/user.h>
 
 #if defined(VGO_linux)
@@ -65,12 +69,6 @@ int main (int argc, char** argv)
 #  include <linux/ptrace.h>
 #endif
 
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_libcsetjmp.h"
-#include "pub_core_threadstate.h"
-#include "pub_core_gdbserver.h"
-
 /* vgdb has two usages:
    1. relay application between gdb and the gdbserver embedded in valgrind.
    2. standalone to send monitor commands to a running valgrind-ified process
-- 
2.47.2