summaryrefslogtreecommitdiffstats
path: root/common/logging.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2017-04-11 04:53:52 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2017-04-11 04:53:52 +0200
commit456c5cdb2d72bba77e2a30c8fdb1c1cebbe9b1d2 (patch)
tree8397452af22ea10edde9414e218ac91bc3b8f7fa /common/logging.c
parenttools: Portability fix for gpgparsemail. (diff)
downloadgnupg2-456c5cdb2d72bba77e2a30c8fdb1c1cebbe9b1d2.tar.xz
gnupg2-456c5cdb2d72bba77e2a30c8fdb1c1cebbe9b1d2.zip
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@fsij.org>
Diffstat (limited to 'common/logging.c')
-rw-r--r--common/logging.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/common/logging.c b/common/logging.c
index 18c40b362..bc5f72b35 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