GitHub user keynslug opened a pull request: https://github.com/apache/thrift/pull/21
Core C++ - mutex timedlock fix, lesser improvements Thrift concurrency::Mutex have had its timedlock implemented slightly wrong. Patched it. Added a pretty simple emulation when a platform does not provide pthread_mutex_timedlock. The solution seems to be close to the one used in Mono for Android. Manually tested under android-8, works fine. The rest commits are the set of small code improvements. I'm pretty sure the commit descriptions are informative enough. You can merge this pull request into a Git repository by running: $ git pull https://github.com/keynslug/thrift trunk Alternatively you can review and apply these changes as the patch at: https://github.com/apache/thrift/pull/21.patch ---- commit 6e701d486ff9302dc91e0f2929e5907bb25c4b2f Author: Andrew Majorov <encube...@gmail.com> Date: 2012-06-08T04:52:38-07:00 Make internally used preprocessor definition names more specific and more likely to be unique. This will suppress error messages and wrong endianness deduction when compiling Thrift core C++ library on Android. commit 0492b68a68d2950d37ef3587d41cc86e86f7f578 Author: Andrew Majorov <encube...@gmail.com> Date: 2012-06-08T04:55:36-07:00 Header config.h now being included conditionally as it supposed to. commit 4cc0b617450696eb50ca9433aee092d5b7cbbcad Author: Andrew Majorov <encube...@gmail.com> Date: 2012-06-08T04:57:24-07:00 Reorder header inclusion to ensure config.h will always be included before any platform stuff. commit 4fcad76434443c738dc73f60c871d027df073ffd Author: Andrew Majorov <encube...@gmail.com> Date: 2012-06-08T05:20:44-07:00 Correct timed lock timeouts and emulation on platforms where it is not supported. commit c822464b3051462acd62854e058dabeb48e33ddb Author: Andrew Majorov <encube...@gmail.com> Date: 2012-06-08T07:06:45-07:00 Merge branch 'upstream' into mytrunk ----