Convert to our own SRWLOCK type on Win32
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/src/win32/mingw-compat.h b/src/win32/mingw-compat.h
index b06dda2..fe0abfb 100644
--- a/src/win32/mingw-compat.h
+++ b/src/win32/mingw-compat.h
@@ -24,8 +24,6 @@ GIT_INLINE(size_t) p_strnlen(const char *s, size_t maxlen) {
return end ? (size_t)(end - s) : maxlen;
}
-typedef struct { void *Ptr; } SRWLOCK;
-
#endif
#endif /* INCLUDE_mingw_compat__ */
diff --git a/src/win32/pthread.c b/src/win32/pthread.c
index 8775f63..d50ace6 100644
--- a/src/win32/pthread.c
+++ b/src/win32/pthread.c
@@ -146,7 +146,7 @@ int pthread_num_processors_np(void)
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_acquire_shared;
diff --git a/src/win32/pthread.h b/src/win32/pthread.h
index 679ebed..2ba2ca5 100644
--- a/src/win32/pthread.h
+++ b/src/win32/pthread.h
@@ -25,9 +25,11 @@ typedef CRITICAL_SECTION pthread_mutex_t;
typedef HANDLE pthread_t;
typedef HANDLE pthread_cond_t;
+typedef struct { void *Ptr; } GIT_SRWLOCK;
+
typedef struct {
union {
- SRWLOCK srwl;
+ GIT_SRWLOCK srwl;
CRITICAL_SECTION csec;
} native;
} pthread_rwlock_t;