Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r72266:913f4c5ecaaa
Date: 2014-06-28 17:19 +0200
http://bitbucket.org/pypy/pypy/changeset/913f4c5ecaaa/
Log: merge heads
diff --git a/rpython/translator/c/src/thread_pthread.c
b/rpython/translator/c/src/thread_pthread.c
--- a/rpython/translator/c/src/thread_pthread.c
+++ b/rpython/translator/c/src/thread_pthread.c
@@ -486,7 +486,7 @@
static inline void timespec_delay(struct timespec *t, double incr)
{
#ifdef CLOCK_REALTIME
- clock_gettime(CLOCK_REALTIME, &t);
+ clock_gettime(CLOCK_REALTIME, t);
#else
struct timeval tv;
RPY_GETTIMEOFDAY(&tv);
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
