diff options
| author | Werner Koch <wk@gnupg.org> | 2016-06-25 11:56:42 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-06-25 11:56:42 +0200 |
| commit | 7213299fdb2293b974fc436686626ae0a29290b8 (patch) | |
| tree | fbf9b6937325ef94594490f4387c8d6a17d9195b | |
| parent | 9b5e3d1608922f4aaf9958e022431849d5a58501 (diff) | |
| download | libgpg-error-7213299fdb2293b974fc436686626ae0a29290b8.tar.gz | |
w32: Silence compiler warnings about redefined macros.
* src/estream.c (S_IRGRP) [W32]: Protect against redefinition.
Signed-off-by: Werner Koch <wk@gnupg.org>
| -rw-r--r-- | src/estream.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/estream.c b/src/estream.c index b4d1c74..2a44ac3 100644 --- a/src/estream.c +++ b/src/estream.c @@ -108,12 +108,25 @@ #ifdef HAVE_W32_SYSTEM -# define S_IRGRP S_IRUSR -# define S_IROTH S_IRUSR -# define S_IWGRP S_IWUSR -# define S_IWOTH S_IWUSR -# define S_IXGRP S_IXUSR -# define S_IXOTH S_IXUSR +# ifndef S_IRGRP +# define S_IRGRP S_IRUSR +# endif +# ifndef S_IROTH +# define S_IROTH S_IRUSR +# endif +# ifndef S_IWGRP +# define S_IWGRP S_IWUSR +# endif +# ifndef S_IWOTH +# define S_IWOTH S_IWUSR +# endif +# ifndef S_IXGRP +# define S_IXGRP S_IXUSR +# endif +# ifndef S_IXOTH +# define S_IXOTH S_IXUSR +# endif +# undef O_NONBLOCK # define O_NONBLOCK 0 /* FIXME: Not yet supported. */ #endif |