Commit e33b00c9 authored by Robert Loehning's avatar Robert Loehning
Browse files

Conditional compilation for functions which are unused on Windows

parent d1ff5f9e
......@@ -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
......
......@@ -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()
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment