Commit c6095505 authored by Tom Hughes's avatar Tom Hughes

Move pthread include.

Based on pull request feedback. See commit 60c52222 for why the pthread
header is necessary.
parent 93ba9333
......@@ -30,6 +30,10 @@
#ifndef GOOGLE_PROTOBUF_STUBS_MUTEX_H_
#define GOOGLE_PROTOBUF_STUBS_MUTEX_H_
#ifdef GOOGLE_PROTOBUF_NO_THREADLOCAL
#include <pthread.h>
#endif
#include <google/protobuf/stubs/macros.h>
// ===================================================================
......
......@@ -115,8 +115,6 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
// TLS support on android.
// iOS also does not support the __thread keyword.
#define GOOGLE_PROTOBUF_NO_THREADLOCAL
#include <pthread.h>
#endif
#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_
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