Conditional compilation for functions which are unused on Windows

diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index de8aa35..113f710 100644 (file)
--- 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 dc36ee5..f099f4f 100644 (file)
--- 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()
 {