[Pkg-gnupg-commit] [gnupg2] 44/132: common: Portability fix for logging.c.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 456c5cdb2d72bba77e2a30c8fdb1c1cebbe9b1d2
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Apr 11 11:53:52 2017 +0900

    common: Portability fix for logging.c.
    
    * common/logging.c (S_IRGRP, S_IWGRP, S_IROTH, S_IWOTH): Avoid
    duplicated definition.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 common/logging.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/logging.c b/common/logging.c
index 18c40b3..bc5f72b 100644
--- a/common/logging.c
+++ b/common/logging.c
@@ -64,10 +64,14 @@
 #include "sysutils.h"
 
 #ifdef HAVE_W32_SYSTEM
-# define S_IRGRP S_IRUSR
-# define S_IROTH S_IRUSR
-# define S_IWGRP S_IWUSR
-# define S_IWOTH S_IWUSR
+# ifndef S_IRWXG
+#  define S_IRGRP S_IRUSR
+#  define S_IWGRP S_IWUSR
+# endif
+# ifndef S_IRWXO
+#  define S_IROTH S_IRUSR
+#  define S_IWOTH S_IWUSR
+# endif
 #endif
 
 

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