From 473862a01b8ed9fef234c9f2f0eb1d087f57d974 Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Wed, 6 Jul 2011 01:07:08 +0000
Subject: Fix MSC_VER related to item 2 in BUGS
---
ChangeLog | 11 +++++++++++
pthread_cond_wait.c | 4 ++--
pthread_once.c | 4 ++--
pthread_rwlock_timedwrlock.c | 4 ++--
pthread_rwlock_wrlock.c | 4 ++--
sem_timedwait.c | 4 ++--
sem_wait.c | 4 ++--
7 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2d4139f..b2396eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-07-06 Ross Johnson <ross dot johnson at homemail dot com dot au>
+
+ * pthread_cond_wait.c (pragma inline_depth): this is almost redundant
+ now nevertheless fixed thei controlling MSC_VER from "< 800" to
+ "< 1400" (i.e. any prior to VC++ 8.0).
+ * pthread_once.ci (pragma inline_depth): Likewise.
+ * pthread_rwlock_timedwrlock.ci (pragma inline_depth): Likewise.
+ * pthread_rwlock_wrlock.ci (pragma inline_depth): Likewise.
+ * sem_timedwait.ci (pragma inline_depth): Likewise.
+ * sem_wait.ci (pragma inline_depth): Likewise.
+
2011-07-05 Ross Johnson <ross dot johnson at homemail dot com dot au>
* pthread_win32_attach_detach_np.c: Use strncat_s if available
diff --git a/pthread_cond_wait.c b/pthread_cond_wait.c
index ddeb1a2..359219a 100644
--- a/pthread_cond_wait.c
+++ b/pthread_cond_wait.c
@@ -401,7 +401,7 @@ ptw32_cond_timedwait (pthread_cond_t * cond,
cleanup_args.cv = cv;
cleanup_args.resultPtr = &result;
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth(0)
#endif
pthread_cleanup_push (ptw32_cond_wait_cleanup, (void *) &cleanup_args);
@@ -438,7 +438,7 @@ ptw32_cond_timedwait (pthread_cond_t * cond,
* Always cleanup
*/
pthread_cleanup_pop (1);
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth()
#endif
diff --git a/pthread_once.c b/pthread_once.c
index f4a36ca..ef2c1f1 100644
--- a/pthread_once.c
+++ b/pthread_once.c
@@ -56,7 +56,7 @@ pthread_once (pthread_once_t * once_control, void (*init_routine) (void))
if (!once_control->done)
{
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth(0)
#endif
@@ -64,7 +64,7 @@ pthread_once (pthread_once_t * once_control, void (*init_routine) (void))
(*init_routine)();
pthread_cleanup_pop(0);
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth()
#endif
diff --git a/pthread_rwlock_timedwrlock.c b/pthread_rwlock_timedwrlock.c
index 36f7e41..8c111bb 100644
--- a/pthread_rwlock_timedwrlock.c
+++ b/pthread_rwlock_timedwrlock.c
@@ -104,7 +104,7 @@ pthread_rwlock_timedwrlock (pthread_rwlock_t * rwlock,
* This routine may be a cancelation point
* according to POSIX 1003.1j section 18.1.2.
*/
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth(0)
#endif
pthread_cleanup_push (ptw32_rwlock_cancelwrwait, (void *) rwl);
@@ -119,7 +119,7 @@ pthread_rwlock_timedwrlock (pthread_rwlock_t * rwlock,
while (result == 0 && rwl->nCompletedSharedAccessCount < 0);
pthread_cleanup_pop ((result != 0) ? 1 : 0);
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth()
#endif
diff --git a/pthread_rwlock_wrlock.c b/pthread_rwlock_wrlock.c
index 170ec1a..e8b4fbb 100644
--- a/pthread_rwlock_wrlock.c
+++ b/pthread_rwlock_wrlock.c
@@ -100,7 +100,7 @@ pthread_rwlock_wrlock (pthread_rwlock_t * rwlock)
* This routine may be a cancelation point
* according to POSIX 1003.1j section 18.1.2.
*/
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth(0)
#endif
pthread_cleanup_push (ptw32_rwlock_cancelwrwait, (void *) rwl);
@@ -113,7 +113,7 @@ pthread_rwlock_wrlock (pthread_rwlock_t * rwlock)
while (result == 0 && rwl->nCompletedSharedAccessCount < 0);
pthread_cleanup_pop ((result != 0) ? 1 : 0);
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth()
#endif
diff --git a/sem_timedwait.c b/sem_timedwait.c
index 103fb9e..638431c 100644
--- a/sem_timedwait.c
+++ b/sem_timedwait.c
@@ -185,7 +185,7 @@ sem_timedwait (sem_t * sem, const struct timespec *abstime)
cleanup_args.sem = s;
cleanup_args.resultPtr = &result;
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth(0)
#endif
/* Must wait */
@@ -195,7 +195,7 @@ sem_timedwait (sem_t * sem, const struct timespec *abstime)
#endif
result = pthreadCancelableTimedWait (s->sem, milliseconds);
pthread_cleanup_pop(result);
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth()
#endif
diff --git a/sem_wait.c b/sem_wait.c
index 966afe6..50c11d8 100644
--- a/sem_wait.c
+++ b/sem_wait.c
@@ -139,7 +139,7 @@ sem_wait (sem_t * sem)
if (v < 0)
{
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth(0)
#endif
/* Must wait */
@@ -147,7 +147,7 @@ sem_wait (sem_t * sem)
result = pthreadCancelableWait (s->sem);
/* Cleanup if we're canceled or on any other error */
pthread_cleanup_pop(result);
-#if defined(_MSC_VER) && _MSC_VER < 800
+#if defined(_MSC_VER) && _MSC_VER < 1400
#pragma inline_depth()
#endif
}
--
cgit v1.2.3