THRIFT-3497 Build fails with "invalid use of incomplete type"
Client: C++
Patch: Simon South

- Monitor.cpp: Include thrift-config.h for definition of
  HAVE_SYS_TIME_H
- Monitor.h: Explicitly include sys/time.h on platforms that require
  this

This closes #753


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/1719bf41
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/1719bf41
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/1719bf41

Branch: refs/heads/master
Commit: 1719bf41b8015cef892e18db7f5ed0e6c496139d
Parents: a873e16
Author: Simon South <[email protected]>
Authored: Mon Dec 21 13:01:03 2015 -0500
Committer: Nobuaki Sukegawa <[email protected]>
Committed: Thu Dec 24 02:11:17 2015 +0900

----------------------------------------------------------------------
 lib/cpp/src/thrift/concurrency/Monitor.cpp | 2 ++
 lib/cpp/src/thrift/concurrency/Monitor.h   | 4 ++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/1719bf41/lib/cpp/src/thrift/concurrency/Monitor.cpp
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/concurrency/Monitor.cpp 
b/lib/cpp/src/thrift/concurrency/Monitor.cpp
index 5e713c0..5969e4a 100644
--- a/lib/cpp/src/thrift/concurrency/Monitor.cpp
+++ b/lib/cpp/src/thrift/concurrency/Monitor.cpp
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+#include <thrift/thrift-config.h>
+
 #include <thrift/concurrency/Monitor.h>
 #include <thrift/concurrency/Exception.h>
 #include <thrift/concurrency/Util.h>

http://git-wip-us.apache.org/repos/asf/thrift/blob/1719bf41/lib/cpp/src/thrift/concurrency/Monitor.h
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/concurrency/Monitor.h 
b/lib/cpp/src/thrift/concurrency/Monitor.h
index 5472f85..2399a98 100644
--- a/lib/cpp/src/thrift/concurrency/Monitor.h
+++ b/lib/cpp/src/thrift/concurrency/Monitor.h
@@ -20,6 +20,10 @@
 #ifndef _THRIFT_CONCURRENCY_MONITOR_H_
 #define _THRIFT_CONCURRENCY_MONITOR_H_ 1
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 #include <thrift/concurrency/Exception.h>
 #include <thrift/concurrency/Mutex.h>
 

Reply via email to