OLD | NEW |
1 /* Types.h -- Basic types | 1 /* 7zTypes.h -- Basic types |
2 2010-10-09 : Igor Pavlov : Public domain */ | 2 2013-11-12 : Igor Pavlov : Public domain */ |
3 | 3 |
4 #ifndef __7Z_TYPES_H | 4 #ifndef __7Z_TYPES_H |
5 #define __7Z_TYPES_H | 5 #define __7Z_TYPES_H |
6 | 6 |
| 7 #ifdef _WIN32 |
| 8 /* #include <windows.h> */ |
| 9 #endif |
| 10 |
7 #include <stddef.h> | 11 #include <stddef.h> |
8 | 12 |
9 #ifdef _WIN32 | |
10 #include <windows.h> | |
11 #endif | |
12 | |
13 #ifndef EXTERN_C_BEGIN | 13 #ifndef EXTERN_C_BEGIN |
14 #ifdef __cplusplus | 14 #ifdef __cplusplus |
15 #define EXTERN_C_BEGIN extern "C" { | 15 #define EXTERN_C_BEGIN extern "C" { |
16 #define EXTERN_C_END } | 16 #define EXTERN_C_END } |
17 #else | 17 #else |
18 #define EXTERN_C_BEGIN | 18 #define EXTERN_C_BEGIN |
19 #define EXTERN_C_END | 19 #define EXTERN_C_END |
20 #endif | 20 #endif |
21 #endif | 21 #endif |
22 | 22 |
(...skipping 13 matching lines...) Expand all Loading... |
36 #define SZ_ERROR_PROGRESS 10 | 36 #define SZ_ERROR_PROGRESS 10 |
37 #define SZ_ERROR_FAIL 11 | 37 #define SZ_ERROR_FAIL 11 |
38 #define SZ_ERROR_THREAD 12 | 38 #define SZ_ERROR_THREAD 12 |
39 | 39 |
40 #define SZ_ERROR_ARCHIVE 16 | 40 #define SZ_ERROR_ARCHIVE 16 |
41 #define SZ_ERROR_NO_ARCHIVE 17 | 41 #define SZ_ERROR_NO_ARCHIVE 17 |
42 | 42 |
43 typedef int SRes; | 43 typedef int SRes; |
44 | 44 |
45 #ifdef _WIN32 | 45 #ifdef _WIN32 |
46 typedef DWORD WRes; | 46 /* typedef DWORD WRes; */ |
| 47 typedef unsigned WRes; |
47 #else | 48 #else |
48 typedef int WRes; | 49 typedef int WRes; |
49 #endif | 50 #endif |
50 | 51 |
51 #ifndef RINOK | 52 #ifndef RINOK |
52 #define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__;
} | 53 #define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__;
} |
53 #endif | 54 #endif |
54 | 55 |
55 typedef unsigned char Byte; | 56 typedef unsigned char Byte; |
56 typedef short Int16; | 57 typedef short Int16; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 #define MY_NO_INLINE __declspec(noinline) | 110 #define MY_NO_INLINE __declspec(noinline) |
110 #else | 111 #else |
111 #define MY_NO_INLINE | 112 #define MY_NO_INLINE |
112 #endif | 113 #endif |
113 | 114 |
114 #define MY_CDECL __cdecl | 115 #define MY_CDECL __cdecl |
115 #define MY_FAST_CALL __fastcall | 116 #define MY_FAST_CALL __fastcall |
116 | 117 |
117 #else | 118 #else |
118 | 119 |
| 120 #define MY_NO_INLINE |
119 #define MY_CDECL | 121 #define MY_CDECL |
120 #define MY_FAST_CALL | 122 #define MY_FAST_CALL |
121 | 123 |
122 #endif | 124 #endif |
123 | 125 |
124 | 126 |
125 /* The following interfaces use first parameter as pointer to structure */ | 127 /* The following interfaces use first parameter as pointer to structure */ |
126 | 128 |
127 typedef struct | 129 typedef struct |
128 { | 130 { |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 #define CHAR_PATH_SEPARATOR '/' | 247 #define CHAR_PATH_SEPARATOR '/' |
246 #define WCHAR_PATH_SEPARATOR L'/' | 248 #define WCHAR_PATH_SEPARATOR L'/' |
247 #define STRING_PATH_SEPARATOR "/" | 249 #define STRING_PATH_SEPARATOR "/" |
248 #define WSTRING_PATH_SEPARATOR L"/" | 250 #define WSTRING_PATH_SEPARATOR L"/" |
249 | 251 |
250 #endif | 252 #endif |
251 | 253 |
252 EXTERN_C_END | 254 EXTERN_C_END |
253 | 255 |
254 #endif | 256 #endif |
OLD | NEW |