Fix Linux build breakage caused by header rearrangement in r11885, sigh.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11886

diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c
index 065821bf19f23f7ef68ef6ff6a662ee432a160c8..1d74708da2d22a20c7971164ed7dda826bc10718 100644 (file)
--- 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