Fix compiling with mingw-w64.

joyent · Sep 15, 2011 · 484d3ba · 484d3ba
1 parent c3994b2
commit 484d3ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/win/winapi.h b/src/win/winapi.h
@@ -4079,8 +4079,8 @@
         (FACILITY_NTWIN32 << 16) | ERROR_SEVERITY_WARNING)))
 
 /* from ntifs.h */
-/* MinGW already has it */
-#ifndef __MINGW32__
+/* MinGW32 already has it */
+#if !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
   typedef struct _REPARSE_DATA_BUFFER {
     ULONG  ReparseTag;
     USHORT ReparseDataLength;

diff --git a/uv.gyp b/uv.gyp
@@ -126,7 +126,7 @@
           ],
           'link_settings': {
             'libraries': [
-              '-lws2_32.lib',
+              '-lws2_32',
             ],
           },
         }, { # Not Windows i.e. POSIX
@@ -275,7 +275,7 @@
             'test/runner-win.c',
             'test/runner-win.h'
           ],
-          'libraries': [ 'ws2_32.lib' ]
+          'libraries': [ '-lws2_32' ]
         }, { # POSIX
           'defines': [ '_GNU_SOURCE' ],
           'ldflags': [ '-pthread' ],
@@ -319,7 +319,7 @@
             'test/runner-win.c',
             'test/runner-win.h',
           ],
-          'libraries': [ 'ws2_32.lib' ]
+          'libraries': [ '-lws2_32' ]
         }, { # POSIX
           'defines': [ '_GNU_SOURCE' ],
           'ldflags': [ '-pthread' ],