From: Kyrre Sjobak <kyrre.ness.sjoebaek@cern.ch>
Date: Tue, 24 Jan 2017 15:08:04 +0000 (+0100)
Subject: Avoid multiple #DEFINEs with the same name
X-Git-Tag: v3.3.0~38^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f60321a1ee2387cb2731784245b6ec671b74ff28;p=thirdparty%2Flibarchive.git

Avoid multiple #DEFINEs with the same name
---

diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 8cf1c56d8..e77cd08fc 100644
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -218,16 +218,20 @@
 #define	S_IWUSR	     _S_IWUSR
 #define	S_IRUSR	     _S_IRUSR
 #endif
+#ifndef S_IRWXG
 #define	S_IRWXG        _S_IRWXG
 #define	S_IXGRP        _S_IXGRP
 #define	S_IWGRP        _S_IWGRP
+#endif
 #ifndef S_IRGRP
 #define	S_IRGRP        _S_IRGRP
 #endif
+#ifndef S_IRWXO
 #define	S_IRWXO        _S_IRWXO
 #define	S_IXOTH        _S_IXOTH
 #define	S_IWOTH        _S_IWOTH
 #define	S_IROTH        _S_IROTH
+#endif
 
 #endif