From 24fe3127835e6f91820c19e0f167fb74971e2a43 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 9 Apr 2013 14:41:24 +0200
Subject: [PATCH] cabarc: Avoid some redefinition warnings.

---
 programs/cabarc/cabarc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c
index bef4bfc8da4..02213f63c51 100644
--- a/programs/cabarc/cabarc.c
+++ b/programs/cabarc/cabarc.c
@@ -35,6 +35,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(cabarc);
 
 /* from msvcrt */
+#ifndef _O_RDONLY
 #define _O_RDONLY      0
 #define _O_WRONLY      1
 #define _O_RDWR        2
@@ -50,17 +51,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc);
 #define _O_SHORT_LIVED 0x1000
 #define _O_TEXT        0x4000
 #define _O_BINARY      0x8000
+#endif
 
+#ifndef _SH_COMPAT
 #define _SH_COMPAT     0x00
 #define _SH_DENYRW     0x10
 #define _SH_DENYWR     0x20
 #define _SH_DENYRD     0x30
 #define _SH_DENYNO     0x40
+#endif
 
+#ifndef _A_RDONLY
 #define _A_RDONLY      0x01
 #define _A_HIDDEN      0x02
 #define _A_SYSTEM      0x04
 #define _A_ARCH        0x20
+#endif
 
 /* command-line options */
 static int opt_cabinet_size = CB_MAX_DISK;
-- 
2.11.4.GIT