1 files changed, 9 insertions, 6 deletions

diff --git a/CPP/7zip/Archive/7z/7zDecode.h b/CPP/7zip/Archive/7z/7zDecode.h
index eeb146e..ee9d9c2 100644
--- a/CPP/7zip/Archive/7z/7zDecode.h
+++ b/CPP/7zip/Archive/7z/7zDecode.h
@@ -1,7 +1,7 @@
 // 7zDecode.h
 
-#ifndef __7Z_DECODE_H
-#define __7Z_DECODE_H
+#ifndef ZIP7_INC_7Z_DECODE_H
+#define ZIP7_INC_7Z_DECODE_H
 
 #include "../Common/CoderMixer2.h"
 
@@ -24,10 +24,13 @@ struct CBindInfoEx: public NCoderMixer2::CBindInfo
 class CDecoder
 {
   bool _bindInfoPrev_Defined;
+  #ifdef USE_MIXER_ST
+  #ifdef USE_MIXER_MT
+    bool _useMixerMT;
+  #endif
+  #endif
   CBindInfoEx _bindInfoPrev;
   
-  bool _useMixerMT;
-  
   #ifdef USE_MIXER_ST
     NCoderMixer2::CMixerST *_mixerST;
   #endif
@@ -57,9 +60,9 @@ public:
       , ISequentialInStream **inStreamMainRes
       , bool &dataAfterEnd_Error
       
-      _7Z_DECODER_CRYPRO_VARS_DECL
+      Z7_7Z_DECODER_CRYPRO_VARS_DECL
       
-      #if !defined(_7ZIP_ST)
+      #if !defined(Z7_ST)
       , bool mtMode, UInt32 numThreads, UInt64 memUsage
       #endif
       );