From e33b00c9ea783abdc33f32dcf67253adf081444a Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Mon, 12 Jul 2010 16:03:20 +0200
Subject: [PATCH] Conditional compilation for functions which are unused on
Windows
---
share/qtcreator/gdbmacros/gdbmacros.cpp | 22 +++++++++++-----------
src/plugins/debugger/debuggerdialogs.cpp | 3 +++
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index de8aa350521..113f710aea8 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -273,17 +273,6 @@ static bool startsWith(const char *s, const char *t)
return true;
}
-static bool couldBePointer(const void *p)
-{
- // we assume valid pointer to be 4-aligned at least.
- // So use this check only when this is guaranteed.
- // FIXME: this breaks e.g. in the QString dumper...
- const quintptr d = quintptr(p);
- //qDebug() << "CHECKING : " << p << ((d & 3) == 0 && (d > 1000 || d == 0));
- //return (d & 3) == 0 && (d > 1000 || d == 0);
- return d > 1000 || d == 0;
-}
-
// Check memory for read access and provoke segfault if nothing else helps.
// On Windows, try to be less crash-prone by checking memory using WinAPI
@@ -314,6 +303,17 @@ static bool couldBePointer(const void *p)
qProvokeSegFaultHelper = *(char*)d; \
} while (0)
+static bool couldBePointer(const void *p)
+{
+ // we assume valid pointer to be 4-aligned at least.
+ // So use this check only when this is guaranteed.
+ // FIXME: this breaks e.g. in the QString dumper...
+ const quintptr d = quintptr(p);
+ //qDebug() << "CHECKING : " << p << ((d & 3) == 0 && (d > 1000 || d == 0));
+ //return (d & 3) == 0 && (d > 1000 || d == 0);
+ return d > 1000 || d == 0;
+}
+
#endif
#ifdef QT_NAMESPACE
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index dc36ee52ad6..f099f4f33ae 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -206,6 +206,8 @@ void AttachCoreDialog::setCoreFile(const QString &fileName)
//
///////////////////////////////////////////////////////////////////////
+#ifndef Q_OS_WIN
+
static bool isUnixProcessId(const QString &procname)
{
for (int i = 0; i != procname.size(); ++i)
@@ -287,6 +289,7 @@ static QList<ProcData> unixProcessList()
}
return rc;
}
+#endif // Q_OS_WIN
static QList<ProcData> processList()
{
--
GitLab