From 9b0754a4505388fece4df81dfe10f23176017fcb Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Sat, 12 Sep 2009 09:17:09 +0200
Subject: [PATCH] Compile with stricter GCC and glibc

---
 src/plugins/debugger/gdb/trkclient.cpp     | 2 ++
 src/plugins/debugger/gdb/trkgdbadapter.cpp | 4 ++++
 src/plugins/debugger/gdb/trkutils.cpp      | 1 +
 tests/manual/trk/trkdevice.cpp             | 1 +
 4 files changed, 8 insertions(+)

diff --git a/src/plugins/debugger/gdb/trkclient.cpp b/src/plugins/debugger/gdb/trkclient.cpp
index bfd4f97acde..c07ff930017 100644
--- a/src/plugins/debugger/gdb/trkclient.cpp
+++ b/src/plugins/debugger/gdb/trkclient.cpp
@@ -43,9 +43,11 @@
 
 #  include <stdio.h>
 #  include <sys/ioctl.h>
+#  include <sys/types.h>
 #  include <termios.h>
 #  include <errno.h>
 #  include <string.h>
+#  include <unistd.h>
 #endif
 
 enum { TimerInterval = 100 };
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 5d919d7c37f..98c11a401fd 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -31,6 +31,10 @@
 #ifndef STANDALONE_RUNNER
 #include "gdbengine.h"
 #endif
+#ifndef Q_OS_WIN
+#  include <sys/types.h>
+#  include <unistd.h>
+#endif
 
 #define TrkCB(s) TrkCallback(this, &TrkGdbAdapter::s)
 
diff --git a/src/plugins/debugger/gdb/trkutils.cpp b/src/plugins/debugger/gdb/trkutils.cpp
index 4036b2ad656..a45084bb8cd 100644
--- a/src/plugins/debugger/gdb/trkutils.cpp
+++ b/src/plugins/debugger/gdb/trkutils.cpp
@@ -28,6 +28,7 @@
 **************************************************************************/
 
 #include "trkutils.h"
+#include <ctype.h>
 
 #include <QtCore/QDebug>
 
diff --git a/tests/manual/trk/trkdevice.cpp b/tests/manual/trk/trkdevice.cpp
index 810069b2539..d5552a9b762 100644
--- a/tests/manual/trk/trkdevice.cpp
+++ b/tests/manual/trk/trkdevice.cpp
@@ -47,6 +47,7 @@
 #  include <termios.h>
 #  include <errno.h>
 #  include <string.h>
+#  include <unistd.h>
 #endif
 
 enum { TimerInterval = 100 };