summaryrefslogtreecommitdiff
path: root/pthread_once.c
diff options
context:
space:
mode:
authorrpj <rpj>2011-03-09 06:51:54 +0000
committerrpj <rpj>2011-03-09 06:51:54 +0000
commiteb28d5aa00690b67cc27e4bd93d2c4c251987c85 (patch)
tree5db601315a671a52c816006733846008e7d3981c /pthread_once.c
parent2c51bb3337275e134e8c40db6dd4eea9407c8bca (diff)
*** empty log message ***
Diffstat (limited to 'pthread_once.c')
-rw-r--r--pthread_once.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pthread_once.c b/pthread_once.c
index 79e4dbc..f5998fa 100644
--- a/pthread_once.c
+++ b/pthread_once.c
@@ -42,8 +42,8 @@ static void PTW32_CDECL
ptw32_once_on_init_cancel (void * arg)
{
/* when the initing thread is cancelled we have to release the lock */
- ptw32_mcs_local_node_t *node = (ptw32_mcs_local_node_t *)arg;
- ptw32_mcs_lock_release(node);
+ ptw32_mcs_local_node_t* nodePtr = (ptw32_mcs_local_node_t *)arg;
+ ptw32_mcs_lock_release(nodePtr);
}
int
@@ -63,7 +63,7 @@ pthread_once (pthread_once_t * once_control, void (*init_routine) (void))
if (!once_control->done)
{
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 800
#pragma inline_depth(0)
#endif
@@ -71,7 +71,7 @@ pthread_once (pthread_once_t * once_control, void (*init_routine) (void))
(*init_routine)();
pthread_cleanup_pop(0);
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 800
#pragma inline_depth()
#endif