Alexandre Julliard : cabarc: Remove duplicate defines.

Alexandre Julliard julliard at winehq.org
Fri May 17 16:10:13 CDT 2019


Module: wine
Branch: master
Commit: 92e50f57574d61a434aaff4c85163e2deec01ad7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=92e50f57574d61a434aaff4c85163e2deec01ad7

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu May 16 22:55:01 2019 +0200

cabarc: Remove duplicate defines.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/cabarc/cabarc.c | 40 +++-------------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c
index 7050d8c..66630db 100644
--- a/programs/cabarc/cabarc.c
+++ b/programs/cabarc/cabarc.c
@@ -20,6 +20,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <fcntl.h>
+#include <io.h>
+#include <share.h>
 
 #define WIN32_LEAN_AND_MEAN
 #include "windows.h"
@@ -30,43 +33,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(cabarc);
 
-/* from msvcrt */
-#ifndef _O_RDONLY
-#define _O_RDONLY      0
-#define _O_WRONLY      1
-#define _O_RDWR        2
-#define _O_APPEND      0x0008
-#define _O_RANDOM      0x0010
-#define _O_SEQUENTIAL  0x0020
-#define _O_TEMPORARY   0x0040
-#define _O_NOINHERIT   0x0080
-#define _O_CREAT       0x0100
-#define _O_TRUNC       0x0200
-#define _O_EXCL        0x0400
-#define _O_SHORT_LIVED 0x1000
-#define _O_TEXT        0x4000
-#define _O_BINARY      0x8000
-#endif
-
-#ifndef _O_ACCMODE
-#define _O_ACCMODE     (_O_RDONLY|_O_WRONLY|_O_RDWR)
-#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;
 static int opt_cabinet_id;




More information about the wine-cvs mailing list