From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 27 Mar 2013 12:01:31 +0000 (+0200)
Subject: Fix MinGW64 compilation warnings in w32.c and w32proc.c.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~526^2~71
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c86f791f69d9d4036089e32d173cf5ccfe42874b;p=emacs.git

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 94eef08b5f8..c4b92bf9c17 100644
--- 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 93a4ce1a8c1..431826c4b82 100644
--- 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>