summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/lzma/CPP/Common/Defs.h
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/lzma/CPP/Common/Defs.h')
-rw-r--r--3rdparty/lzma/CPP/Common/Defs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdparty/lzma/CPP/Common/Defs.h b/3rdparty/lzma/CPP/Common/Defs.h
index 9adb88cfcc6..e302f358722 100644
--- a/3rdparty/lzma/CPP/Common/Defs.h
+++ b/3rdparty/lzma/CPP/Common/Defs.h
@@ -1,7 +1,7 @@
// Common/Defs.h
-#ifndef __COMMON_DEFS_H
-#define __COMMON_DEFS_H
+#ifndef ZIP7_INC_COMMON_DEFS_H
+#define ZIP7_INC_COMMON_DEFS_H
template <class T> inline T MyMin(T a, T b) { return a < b ? a : b; }
template <class T> inline T MyMax(T a, T b) { return a > b ? a : b; }
@@ -10,7 +10,7 @@ template <class T> inline int MyCompare(T a, T b)
{ return a == b ? 0 : (a < b ? -1 : 1); }
inline int BoolToInt(bool v) { return (v ? 1 : 0); }
-inline unsigned BoolToUInt(bool v) { return (v ? (unsigned)1 : (unsigned)0); }
+inline unsigned BoolToUInt(bool v) { return (v ? 1u : 0u); }
inline bool IntToBool(int v) { return (v != 0); }
#endif