X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Flog%2Fsrc%2Fwindows%2Flight_rw_mutex.cpp;h=885dc175204d61fb1afdfc58e8c9158bc9a442d5;hb=92f5a8d42d07f9929ae4fa7e01342fe8d96808a8;hp=010cb55d2ae5bf467bbd08aa606fbd0c47b0c33b;hpb=a0324939f9d0e1905d5df8f57442f09dc70af83d;p=ceph.git

diff --git a/ceph/src/boost/libs/log/src/windows/light_rw_mutex.cpp b/ceph/src/boost/libs/log/src/windows/light_rw_mutex.cpp
index 010cb55d2..885dc1752 100644
--- a/ceph/src/boost/libs/log/src/windows/light_rw_mutex.cpp
+++ b/ceph/src/boost/libs/log/src/windows/light_rw_mutex.cpp
@@ -42,20 +42,20 @@ BOOST_LOG_ANONYMOUS_NAMESPACE {
 
 struct BOOST_LOG_MAY_ALIAS mutex_impl { void* p; }; // has the same layout as SRWLOCK and light_rw_mutex::m_Mutex
 
-typedef void (WINAPI *init_fun_t)(mutex_impl*);
-typedef void (WINAPI *destroy_fun_t)(mutex_impl*);
-typedef void (WINAPI *lock_exclusive_fun_t)(mutex_impl*);
-typedef void (WINAPI *lock_shared_fun_t)(mutex_impl*);
-typedef void (WINAPI *unlock_exclusive_fun_t)(mutex_impl*);
-typedef void (WINAPI *unlock_shared_fun_t)(mutex_impl*);
+typedef void (BOOST_WINAPI_WINAPI_CC *init_fun_t)(mutex_impl*);
+typedef void (BOOST_WINAPI_WINAPI_CC *destroy_fun_t)(mutex_impl*);
+typedef void (BOOST_WINAPI_WINAPI_CC *lock_exclusive_fun_t)(mutex_impl*);
+typedef void (BOOST_WINAPI_WINAPI_CC *lock_shared_fun_t)(mutex_impl*);
+typedef void (BOOST_WINAPI_WINAPI_CC *unlock_exclusive_fun_t)(mutex_impl*);
+typedef void (BOOST_WINAPI_WINAPI_CC *unlock_shared_fun_t)(mutex_impl*);
 
 //! A complement stub function for InitializeSRWLock
-void WINAPI DeinitializeSRWLock(mutex_impl*)
+void BOOST_WINAPI_WINAPI_CC DeinitializeSRWLock(mutex_impl*)
 {
 }
 
 // The Boost.Thread-based implementation
-void WINAPI InitializeSharedMutex(mutex_impl* mtx)
+void BOOST_WINAPI_WINAPI_CC InitializeSharedMutex(mutex_impl* mtx)
 {
     // To avoid cache line aliasing we do aligned memory allocation here
     enum
@@ -63,8 +63,7 @@ void WINAPI InitializeSharedMutex(mutex_impl* mtx)
         // Allocation size is the minimum number of cache lines to accommodate shared_mutex
         size =
             (
-                sizeof(shared_mutex) / BOOST_LOG_CPU_CACHE_LINE_SIZE
-                + ((sizeof(shared_mutex) % BOOST_LOG_CPU_CACHE_LINE_SIZE) != 0)
+                (sizeof(shared_mutex) + BOOST_LOG_CPU_CACHE_LINE_SIZE - 1u) / BOOST_LOG_CPU_CACHE_LINE_SIZE
             )
             * BOOST_LOG_CPU_CACHE_LINE_SIZE
     };
@@ -73,29 +72,29 @@ void WINAPI InitializeSharedMutex(mutex_impl* mtx)
     new (mtx->p) shared_mutex();
 }
 
-void WINAPI DeinitializeSharedMutex(mutex_impl* mtx)
+void BOOST_WINAPI_WINAPI_CC DeinitializeSharedMutex(mutex_impl* mtx)
 {
     static_cast< shared_mutex* >(mtx->p)->~shared_mutex();
     alignment::aligned_free(mtx->p);
     mtx->p = NULL;
 }
 
-void WINAPI ExclusiveLockSharedMutex(mutex_impl* mtx)
+void BOOST_WINAPI_WINAPI_CC ExclusiveLockSharedMutex(mutex_impl* mtx)
 {
     static_cast< shared_mutex* >(mtx->p)->lock();
 }
 
-void WINAPI SharedLockSharedMutex(mutex_impl* mtx)
+void BOOST_WINAPI_WINAPI_CC SharedLockSharedMutex(mutex_impl* mtx)
 {
     static_cast< shared_mutex* >(mtx->p)->lock_shared();
 }
 
-void WINAPI ExclusiveUnlockSharedMutex(mutex_impl* mtx)
+void BOOST_WINAPI_WINAPI_CC ExclusiveUnlockSharedMutex(mutex_impl* mtx)
 {
     static_cast< shared_mutex* >(mtx->p)->unlock();
 }
 
-void WINAPI SharedUnlockSharedMutex(mutex_impl* mtx)
+void BOOST_WINAPI_WINAPI_CC SharedUnlockSharedMutex(mutex_impl* mtx)
 {
     static_cast< shared_mutex* >(mtx->p)->unlock_shared();
 }