fix warnings in windows build

joyent · Jan 12, 2012 · 94a5c7b · 94a5c7b
1 parent e8494dd
commit 94a5c7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/include/uv-private/uv-win.h b/include/uv-private/uv-win.h
@@ -23,6 +23,7 @@
 # define _WIN32_WINNT   0x0502
 #endif
 
+#include <process.h>
 #include <stdint.h>
 #include <winsock2.h>
 #include <mswsock.h>
@@ -102,6 +103,9 @@
                        LPOVERLAPPED lpOverlapped,
                        LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,
                        DWORD dwFlags);
+
+  typedef PVOID RTL_SRWLOCK;
+  typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK;
 #endif
 
 typedef int (WSAAPI* LPFN_WSARECV)
@@ -144,7 +148,7 @@ typedef CRITICAL_SECTION uv_mutex_t;
 typedef union {
   /* srwlock_ has type SRWLOCK, but not all toolchains define this type in */
   /* windows.h. */
-  void* srwlock_;
+  SRWLOCK srwlock_;
   struct {
     uv_mutex_t read_mutex_;
     uv_mutex_t write_mutex_;

diff --git a/src/win/thread.c b/src/win/thread.c
@@ -114,7 +114,7 @@ int uv_thread_join(uv_thread_t *tid) {
 
 
 uv_thread_t uv_thread_self(void) {
-  return GetCurrentThreadId();
+  return GetCurrentThread();
 }
 
 

diff --git a/src/win/winapi.h b/src/win/winapi.h
@@ -4337,11 +4337,6 @@ typedef NTSTATUS (NTAPI *sNtSetInformationFile)
   } OVERLAPPED_ENTRY, *LPOVERLAPPED_ENTRY;
 #endif
 
-#ifdef __MINGW32__
-  typedef PVOID RTL_SRWLOCK;
-  typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK;
-#endif
-
 /* from wincon.h */
 #ifndef ENABLE_INSERT_MODE
 # define ENABLE_INSERT_MODE 0x20