- cleaned up some aspects of twistdroache's osx changeset

- added -std=gnu11 to the makefile, to make sure the timespec struct gets defined where available.

Makefile

@@ -1,7 +1,7 @@
 obj = test.o
 bin = test
 
-CFLAGS = -pedantic -Wall -g
+CFLAGS = -std=gnu99 -pedantic -Wall -g
 LDFLAGS = -lpthread
 
 $(bin): $(obj)

c11threads.h

@@ -18,14 +18,15 @@ Main project site: https://github.com/jtsiomb/c11threads
 #include <sys/time.h>
 
 #define ONCE_FLAG_INIT	PTHREAD_ONCE_INIT
-#define SLEEP_NANOS 5000000	/* 5 ms */
 
-#ifdef __APPLE__
-#define _C11THREADS_NO_TIMED_MUTEX
+#ifndef PTHREAD_MUTEX_TIMED_NP
+/* detect systems which don't support timed mutexes (like macosx currently) */
+#define C11THREADS_NO_TIMED_MUTEX
 #endif
 
-#ifdef _C11THREADS_NO_TIMED_MUTEX
+#ifdef C11THREADS_NO_TIMED_MUTEX
 #define PTHREAD_MUTEX_TIMED_NP PTHREAD_MUTEX_NORMAL
+#define C11THREADS_TIMEDLOCK_POLL_INTERVAL 5000000	/* 5 ms */
 #endif
 
 /* types */
@@ -163,17 +164,19 @@ static inline int mtx_trylock(mtx_t *mtx)
 static inline int mtx_timedlock(mtx_t *mtx, const struct timespec *ts)
 {
 	int res;
-#ifdef _C11THREADS_NO_TIMED_MUTEX
+#ifdef C11THREADS_NO_TIMED_MUTEX
+	/* fake a timedlock by polling trylock in a loop and waiting for a bit */
 	struct timeval now;
 	struct timespec sleeptime;
 
 	sleeptime.tv_sec = 0;
-	sleeptime.tv_nsec = SLEEP_NANOS;
+	sleeptime.tv_nsec = C11THREADS_TIMEDLOCK_POLL_INTERVAL;
 
-	while ((res = pthread_mutex_trylock(mtx)) == EBUSY) {
+	while((res = pthread_mutex_trylock(mtx)) == EBUSY) {
 		gettimeofday(&now, NULL);
 
-		if (now.tv_sec > ts->tv_sec || (now.tv_sec == ts->tv_sec && (now.tv_usec * 1000) >= ts->tv_nsec)) {
+		if(now.tv_sec > ts->tv_sec || (now.tv_sec == ts->tv_sec &&
+					(now.tv_usec * 1000) >= ts->tv_nsec)) {
 			return thrd_timedout;
 		}
 
@@ -258,7 +261,7 @@ static inline void call_once(once_flag *flag, void (*func)(void))
 	pthread_once(flag, func);
 }
 
-#if __STDC_VERSION__ < 201112L || defined (_C11THREADS_NO_TIMED_MUTEX)
+#if __STDC_VERSION__ < 201112L || defined(C11THREADS_NO_TIMED_MUTEX)
 /* TODO take base into account */
 static inline int timespec_get(struct timespec *ts, int base)
 {