[Emacs-diffs] /srv/bzr/emacs/trunk r112156: Fix MinGW64 compilation warnings in w32.c and w32proc.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112156
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-03-27 14:01:31 +0200
message:
  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.
modified:
  src/ChangeLog
  src/w32.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-26 21:22:39 +0000
+++ b/src/ChangeLog     2013-03-27 12:01:31 +0000
@@ -1,3 +1,11 @@
+2013-03-27  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32.c (_REPARSE_DATA_BUFFER): Condition by _MSVC and _W64.

=== modified file 'src/w32.c'
--- a/src/w32.c 2013-03-26 21:22:39 +0000
+++ b/src/w32.c 2013-03-27 12:01:31 +0000
@@ -174,9 +174,12 @@
 #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>