From 457786af9be76e83c3b805ea388097dc326538f6 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 7 Jun 2014 07:48:04 +0000
Subject: [PATCH] drd/tests/std_thread: Minimize diffs with original

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14002
---
 drd/tests/std_thread.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drd/tests/std_thread.cpp b/drd/tests/std_thread.cpp
index 4d637a388..6fd4147b9 100644
--- a/drd/tests/std_thread.cpp
+++ b/drd/tests/std_thread.cpp
@@ -27,8 +27,6 @@ int main(int argc, char** argv)
 // From libstdc++-v3/src/c++11/thread.cc
 //
 
-#include <system_error>
-
 extern "C" void* execute_native_thread_routine(void* __p)
 {
   std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
@@ -46,6 +44,8 @@ extern "C" void* execute_native_thread_routine(void* __p)
   return 0;
 }
 
+#include <system_error>
+
 namespace std
 {
   void thread::_M_start_thread(__shared_base_type __b)
@@ -59,8 +59,8 @@ namespace std
 #endif
 
     __b->_M_this_ptr = __b;
-    int __e = pthread_create(&_M_id._M_thread, NULL,
-                             &execute_native_thread_routine, __b.get());
+    int __e = __gthread_create(&_M_id._M_thread, execute_native_thread_routine,
+                               __b.get());
     if (__e) {
       __b->_M_this_ptr.reset();
       __throw_system_error(__e);