[CABINET] Sync with Wine Staging 3.3. CORE-14434

[reactos.git] / dll / win32 / cabinet / cabinet.h

diff --git a/dll/win32/cabinet/cabinet.h b/dll/win32/cabinet/cabinet.h
index d397f0d..52736db 100644 (file)
--- a/dll/win32/cabinet/cabinet.h
+++ b/dll/win32/cabinet/cabinet.h
@@ -21,17 +21,13 @@
 #ifndef __WINE_CABINET_H
 #define __WINE_CABINET_H
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 
-#include <windef.h>
-#include <winbase.h>
-#include <winnt.h>
-#include <fdi.h>
-#include <fci.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "fdi.h"
+#include "fci.h"
 
 /* from msvcrt/sys/stat.h */
 #define _S_IWRITE 0x0080
@@ -66,10 +62,7 @@ typedef INT32         cab_LONG;  /* 32 bits */
 typedef UINT32        cab_off_t;
 
 /* number of bits in a ULONG */
-#ifndef CHAR_BIT
-# define CHAR_BIT (8)
-#endif
-#define CAB_ULONG_BITS (sizeof(cab_ULONG) * CHAR_BIT)
+#define CAB_ULONG_BITS (sizeof(cab_ULONG) * 8) /* CHAR_BIT */
 
 /* structure offsets */
 #define cfhead_Signature         (0x00)