THRIFT-953: Fix compilation of TransportTest.cpp on Mac (actual tests still fail) and fix boost m4 macros for Mac.
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1031148 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/test/TransportTest.cpp b/lib/cpp/test/TransportTest.cpp
index 59f2427..0762eca 100644
--- a/lib/cpp/test/TransportTest.cpp
+++ b/lib/cpp/test/TransportTest.cpp
@@ -379,7 +379,7 @@
struct sigaction action;
memset(&action, 0, sizeof(action));
action.sa_handler = alarm_handler;
- action.sa_flags = SA_ONESHOT;
+ action.sa_flags = SA_RESETHAND;
sigemptyset(&action.sa_mask);
sigaction(SIGALRM, &action, NULL);
@@ -1025,9 +1025,10 @@
if (!have_seed) {
// choose a seed now if the user didn't specify one
- struct timespec t;
- clock_gettime(CLOCK_REALTIME, &t);
- options->seed = t.tv_sec + t.tv_nsec;
+ struct timeval tv;
+ struct timezone tz;
+ gettimeofday(&tv, &tz);
+ options->seed = tv.tv_sec ^ tv.tv_usec;
}
}