diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-03-27 14:01:31 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-03-27 14:01:31 +0200 |
| commit | c86f791f69d9d4036089e32d173cf5ccfe42874b (patch) | |
| tree | 39ebad77fb6394c0bdcb3e631b54cabc6cb842bb | |
| parent | a0adf07cf083377da3be8ac335cb4ff5242bbac0 (diff) | |
| download | emacs-c86f791f69d9d4036089e32d173cf5ccfe42874b.tar.gz emacs-c86f791f69d9d4036089e32d173cf5ccfe42874b.tar.bz2 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.
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/w32.c | 3 |
2 files changed, 11 insertions, 0 deletions
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> |