Commit f087bc24 by Russell Belfer

Convert to our own SRWLOCK type on Win32

parent 2f368a66
...@@ -24,8 +24,6 @@ GIT_INLINE(size_t) p_strnlen(const char *s, size_t maxlen) { ...@@ -24,8 +24,6 @@ GIT_INLINE(size_t) p_strnlen(const char *s, size_t maxlen) {
return end ? (size_t)(end - s) : maxlen; return end ? (size_t)(end - s) : maxlen;
} }
typedef struct { void *Ptr; } SRWLOCK;
#endif #endif
#endif /* INCLUDE_mingw_compat__ */ #endif /* INCLUDE_mingw_compat__ */
...@@ -146,7 +146,7 @@ int pthread_num_processors_np(void) ...@@ -146,7 +146,7 @@ int pthread_num_processors_np(void)
static HINSTANCE win32_kernel32_dll; static HINSTANCE win32_kernel32_dll;
typedef void (WINAPI *win32_srwlock_fn)(SRWLOCK *); typedef void (WINAPI *win32_srwlock_fn)(GIT_SRWLOCK *);
static win32_srwlock_fn win32_srwlock_initialize; static win32_srwlock_fn win32_srwlock_initialize;
static win32_srwlock_fn win32_srwlock_acquire_shared; static win32_srwlock_fn win32_srwlock_acquire_shared;
......
...@@ -25,9 +25,11 @@ typedef CRITICAL_SECTION pthread_mutex_t; ...@@ -25,9 +25,11 @@ typedef CRITICAL_SECTION pthread_mutex_t;
typedef HANDLE pthread_t; typedef HANDLE pthread_t;
typedef HANDLE pthread_cond_t; typedef HANDLE pthread_cond_t;
typedef struct { void *Ptr; } GIT_SRWLOCK;
typedef struct { typedef struct {
union { union {
SRWLOCK srwl; GIT_SRWLOCK srwl;
CRITICAL_SECTION csec; CRITICAL_SECTION csec;
} native; } native;
} pthread_rwlock_t; } pthread_rwlock_t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment