From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 8 Oct 2012 12:31:45 +0000 (+0000)
Subject: Undo r26920 since that appears to have led to numerous testsuite failures.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f9936dff834a9eb2fa56803ea19e6d1d7667909;p=dealii-svn.git

Undo r26920 since that appears to have led to numerous testsuite failures.

git-svn-id: https://svn.dealii.org/trunk@27002 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/source/base/thread_management.cc b/deal.II/source/base/thread_management.cc
index e439ecd906..7549689b48 100644
--- a/deal.II/source/base/thread_management.cc
+++ b/deal.II/source/base/thread_management.cc
@@ -148,10 +148,10 @@ namespace Threads
 
   unsigned int this_thread_id ()
   {
-#if HAVE_GETPID
-    const pid_t this_id = getpid();
-#elif SYS_gettid
+#ifdef SYS_gettid
     const int this_id = syscall(SYS_gettid);
+#elif HAVE_GETPID
+    const pid_t this_id = getpid();
 #else
 #  ifdef DEAL_II_MSVC
     const unsigned int this_id = 0;