9.34

CPP/7zip/Archive/Cab/CabHeader.h

@@ -3,7 +3,7 @@
 #ifndef __ARCHIVE_CAB_HEADER_H
 #define __ARCHIVE_CAB_HEADER_H
 
-#include "Common/Types.h"
+#include "../../../Common/MyTypes.h"
 
 namespace NArchive {
 namespace NCab {
@@ -12,17 +12,14 @@ namespace NHeader {
 const unsigned kMarkerSize = 8;
 extern Byte kMarker[kMarkerSize];
 
-namespace NArchive
+namespace NArcFlags
 {
-  namespace NFlags
-  {
-    const int kPrevCabinet = 0x0001;
-    const int kNextCabinet = 0x0002;
-    const int kReservePresent = 0x0004;
-  }
+  const unsigned kPrevCabinet = 1;
+  const unsigned kNextCabinet = 2;
+  const unsigned kReservePresent = 4;
 }
 
-namespace NCompressionMethodMajor
+namespace NMethod
 {
   const Byte kNone = 0;
   const Byte kMSZip = 1;
@@ -30,13 +27,13 @@ namespace NCompressionMethodMajor
   const Byte kLZX = 3;
 }
 
-const int kFileNameIsUTFAttributeMask = 0x80;
+const unsigned kFileNameIsUtf8_Mask = 0x80;
 
 namespace NFolderIndex
 {
-  const int kContinuedFromPrev    = 0xFFFD;
-  const int kContinuedToNext      = 0xFFFE;
-  const int kContinuedPrevAndNext = 0xFFFF;
+  const unsigned kContinuedFromPrev    = 0xFFFD;
+  const unsigned kContinuedToNext      = 0xFFFE;
+  const unsigned kContinuedPrevAndNext = 0xFFFF;
 }
 
 }}}