Flush (work in progress)

[mono.git] / mono / io-layer / mono-mutex.c

diff --git a/mono/io-layer/mono-mutex.c b/mono/io-layer/mono-mutex.c
index 154035a6e5fa64c5f4e049cdb800606d3ae45b5b..f5152c2f29d5159cb294208ef16ed114f3da6608 100644 (file)
--- a/mono/io-layer/mono-mutex.c
+++ b/mono/io-layer/mono-mutex.c
@@ -22,11 +22,19 @@
 
 
 #ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
-int pthread_mutex_timedlock (pthread_mutex_t *mutex,
-                           const struct timespec *timeout);
+/* Android does not implement pthread_mutex_timedlock(), but does provide an
+ * unusual declaration: http://code.google.com/p/android/issues/detail?id=7807
+ */
+#ifdef PLATFORM_ANDROID
+#define CONST_NEEDED
+#else
+#define CONST_NEEDED const
+#endif
 
+int pthread_mutex_timedlock (pthread_mutex_t *mutex,
+                           CONST_NEEDED struct timespec *timeout);
 int
-pthread_mutex_timedlock (pthread_mutex_t *mutex, const struct timespec *timeout)
+pthread_mutex_timedlock (pthread_mutex_t *mutex, CONST_NEEDED struct timespec *timeout)
 {
        struct timeval timenow;
        struct timespec sleepytime;