1 files changed, 8 insertions, 8 deletions

diff --git a/CPP/7zip/Common/InBuffer.h b/CPP/7zip/Common/InBuffer.h
index fa06394..3aaf797 100644
--- a/CPP/7zip/Common/InBuffer.h
+++ b/CPP/7zip/Common/InBuffer.h
@@ -1,12 +1,12 @@
 // InBuffer.h
 
-#ifndef __IN_BUFFER_H
-#define __IN_BUFFER_H
+#ifndef ZIP7_INC_IN_BUFFER_H
+#define ZIP7_INC_IN_BUFFER_H
 
 #include "../../Common/MyException.h"
 #include "../IStream.h"
 
-#ifndef _NO_EXCEPTIONS
+#ifndef Z7_NO_EXCEPTIONS
 struct CInBufferException: public CSystemException
 {
   CInBufferException(HRESULT errorCode): CSystemException(errorCode) {}
@@ -31,7 +31,7 @@ protected:
   Byte ReadByte_FromNewBlock();
 
 public:
-  #ifdef _NO_EXCEPTIONS
+  #ifdef Z7_NO_EXCEPTIONS
   HRESULT ErrorCode;
   #endif
   UInt32 NumExtraBytes;
@@ -60,7 +60,7 @@ public:
     _buf = buf + pos;
     _bufLim = buf + end;
     _wasFinished = false;
-    #ifdef _NO_EXCEPTIONS
+    #ifdef Z7_NO_EXCEPTIONS
     ErrorCode = S_OK;
     #endif
     NumExtraBytes = 0;
@@ -68,7 +68,7 @@ public:
 
   void Init() throw();
   
-  MY_FORCE_INLINE
+  Z7_FORCE_INLINE
   bool ReadByte(Byte &b)
   {
     if (_buf >= _bufLim)
@@ -77,7 +77,7 @@ public:
     return true;
   }
 
-  MY_FORCE_INLINE
+  Z7_FORCE_INLINE
   bool ReadByte_FromBuf(Byte &b)
   {
     if (_buf >= _bufLim)
@@ -86,7 +86,7 @@ public:
     return true;
   }
   
-  MY_FORCE_INLINE
+  Z7_FORCE_INLINE
   Byte ReadByte()
   {
     if (_buf >= _bufLim)