summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorheikki@donna.mysql.fi <>2001-09-20 21:38:46 +0300
committerheikki@donna.mysql.fi <>2001-09-20 21:38:46 +0300
commite2389946dd46fb5cf0fa92532c757d683d83c61b (patch)
tree3a623e38cace80879380118300b360733637f226
parent0b064c3b0903ced19a97e4526e344226a42cb27f (diff)
downloadmariadb-git-e2389946dd46fb5cf0fa92532c757d683d83c61b.tar.gz
os0sync.h Define os_fast_mutex functions also in Windows
os0sync.ic Define os_fast_mutex functions also in Windows
-rw-r--r--innobase/include/os0sync.h2
-rw-r--r--innobase/include/os0sync.ic2
2 files changed, 2 insertions, 2 deletions
diff --git a/innobase/include/os0sync.h b/innobase/include/os0sync.h
index 89e3f953b50..78374cf8ede 100644
--- a/innobase/include/os0sync.h
+++ b/innobase/include/os0sync.h
@@ -160,6 +160,7 @@ os_fast_mutex_trylock(
was reserved by another
thread */
os_fast_mutex_t* fast_mutex); /* in: mutex to acquire */
+#endif
/**************************************************************
Releases ownership of a fast mutex. */
UNIV_INLINE
@@ -188,7 +189,6 @@ void
os_fast_mutex_free(
/*===============*/
os_fast_mutex_t* fast_mutex); /* in: mutex to free */
-#endif
#ifndef UNIV_NONINL
#include "os0sync.ic"
diff --git a/innobase/include/os0sync.ic b/innobase/include/os0sync.ic
index 8be9a783593..057ad424dee 100644
--- a/innobase/include/os0sync.ic
+++ b/innobase/include/os0sync.ic
@@ -38,6 +38,7 @@ os_fast_mutex_trylock(
return((ulint) pthread_mutex_trylock(fast_mutex));
#endif
}
+#endif
/**************************************************************
Releases ownership of a fast mutex. */
@@ -53,4 +54,3 @@ os_fast_mutex_unlock(
pthread_mutex_unlock(fast_mutex);
#endif
}
-#endif