aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32.c
diff options
context:
space:
mode:
authorEli Zaretskii2013-03-27 14:01:31 +0200
committerEli Zaretskii2013-03-27 14:01:31 +0200
commitc86f791f69d9d4036089e32d173cf5ccfe42874b (patch)
tree39ebad77fb6394c0bdcb3e631b54cabc6cb842bb /src/w32.c
parenta0adf07cf083377da3be8ac335cb4ff5242bbac0 (diff)
downloademacs-c86f791f69d9d4036089e32d173cf5ccfe42874b.tar.gz
emacs-c86f791f69d9d4036089e32d173cf5ccfe42874b.zip
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.
Diffstat (limited to 'src/w32.c')
-rw-r--r--src/w32.c3
1 files changed, 3 insertions, 0 deletions
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 {
174#ifndef CTL_CODE 174#ifndef CTL_CODE
175#define CTL_CODE(t,f,m,a) (((t)<<16)|((a)<<14)|((f)<<2)|(m)) 175#define CTL_CODE(t,f,m,a) (((t)<<16)|((a)<<14)|((f)<<2)|(m))
176#endif 176#endif
177/* MinGW64 defines FSCTL_GET_REPARSE_POINT on winioctl.h. */
178#ifndef FSCTL_GET_REPARSE_POINT
177#define FSCTL_GET_REPARSE_POINT \ 179#define FSCTL_GET_REPARSE_POINT \
178 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) 180 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
179#endif 181#endif
182#endif
180 183
181/* TCP connection support. */ 184/* TCP connection support. */
182#include <sys/socket.h> 185#include <sys/socket.h>