[Pkg-gnupg-commit] [libgpg-error] 04/15: w32: Silence compiler warnings about redefined macros.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository libgpg-error.

commit 7213299fdb2293b974fc436686626ae0a29290b8
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Jun 25 11:56:42 2016 +0200

    w32: Silence compiler warnings about redefined macros.
    
    * src/estream.c (S_IRGRP) [W32]: Protect against redefinition.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 src/estream.c | 25 +++++++++++++++++++------
 1 file 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libgpg-error.git