Index: third_party/lzma_sdk/7zTypes.h |
diff --git a/third_party/lzma_sdk/Types.h b/third_party/lzma_sdk/7zTypes.h |
similarity index 96% |
rename from third_party/lzma_sdk/Types.h |
rename to third_party/lzma_sdk/7zTypes.h |
index 7732c240c698c55f35e5e7f079f7aa17ab8b1567..778413ef424ac51570015a55721e547c7c647a03 100644 |
--- a/third_party/lzma_sdk/Types.h |
+++ b/third_party/lzma_sdk/7zTypes.h |
@@ -1,15 +1,15 @@ |
-/* Types.h -- Basic types |
-2010-10-09 : Igor Pavlov : Public domain */ |
+/* 7zTypes.h -- Basic types |
+2013-11-12 : Igor Pavlov : Public domain */ |
#ifndef __7Z_TYPES_H |
#define __7Z_TYPES_H |
-#include <stddef.h> |
- |
#ifdef _WIN32 |
-#include <windows.h> |
+/* #include <windows.h> */ |
#endif |
+#include <stddef.h> |
+ |
#ifndef EXTERN_C_BEGIN |
#ifdef __cplusplus |
#define EXTERN_C_BEGIN extern "C" { |
@@ -43,7 +43,8 @@ EXTERN_C_BEGIN |
typedef int SRes; |
#ifdef _WIN32 |
-typedef DWORD WRes; |
+/* typedef DWORD WRes; */ |
+typedef unsigned WRes; |
#else |
typedef int WRes; |
#endif |
@@ -116,6 +117,7 @@ typedef int Bool; |
#else |
+#define MY_NO_INLINE |
#define MY_CDECL |
#define MY_FAST_CALL |