diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index de8aa350521a41637d8c26204cbe0e9d367f8c5e..113f710aea89d7de9f8e750a8fabf24d07c0e0dd 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 dc36ee52ad66f2dfa10d9927ea72a15b1810e1a4..f099f4f33ae03f47224d75c0496e28c303cc757b 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() {