Fix MinGW64 compilation warnings in w32.c and w32proc.c.

 src/w32proc.c (IsValidLocale) [__GNUC__]: Don't declare prototype,
 since MinGW's w32api headers do.  This avoids compiler warnings.
 src/w32.c (FSCTL_GET_REPARSE_POINT) [_MSC_VER || _W64]: Don't define
 if already defined.

diff --git a/src/ChangeLog b/src/ChangeLog
index 94eef08b5f8d4117697d4a52c40a66ccd6d5a722..c4b92bf9c179ad3daf5ff1a4c332e6f0012577a4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-27  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32proc.c (IsValidLocale) [__GNUC__]: Don't declare prototype,
+       since MinGW's w32api headers do.  This avoids compiler warnings.
+
+       * w32.c (FSCTL_GET_REPARSE_POINT) [_MSC_VER || _W64]: Don't define
+       if already defined.
+
 2013-03-26  Eli Zaretskii  <eliz@gnu.org>
 
        * w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64.

diff --git a/src/w32.c b/src/w32.c
index 93a4ce1a8c1286eb4f63b8b1ecc5a972fe0db010..431826c4b82ad93b557f51bb54d869d8caa7c18a 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -174,9 +174,12 @@ typedef struct _REPARSE_DATA_BUFFER {
 #ifndef CTL_CODE
 #define CTL_CODE(t,f,m,a)       (((t)<<16)|((a)<<14)|((f)<<2)|(m))
 #endif
+/* MinGW64 defines FSCTL_GET_REPARSE_POINT on winioctl.h.  */
+#ifndef FSCTL_GET_REPARSE_POINT
 #define FSCTL_GET_REPARSE_POINT \
   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #endif
+#endif
 
 /* TCP connection support.  */
 #include <sys/socket.h>