diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2014-03-18 18:04:42 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2014-03-19 13:00:00 +0400 |
| commit | 7d361f58b65264857e2244964914640efb7cfaa4 (patch) | |
| tree | 40b64163d0b6d92d623df37416dae046ea73d9f6 /src/thirdparty/unrar/os.hpp | |
| parent | 44c3827e1f29793f00fda52407066ecfa79e5f0c (diff) | |
Update unrar to v5.1.1.
Diffstat (limited to 'src/thirdparty/unrar/os.hpp')
| -rw-r--r-- | src/thirdparty/unrar/os.hpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/thirdparty/unrar/os.hpp b/src/thirdparty/unrar/os.hpp index ed76a1935..95fa5d6d3 100644 --- a/src/thirdparty/unrar/os.hpp +++ b/src/thirdparty/unrar/os.hpp @@ -42,11 +42,10 @@ #include <shlobj.h> #include <winioctl.h> #include <wincrypt.h> - - #include <wchar.h> #include <wctype.h> + #endif // _WIN_ALL #include <sys/types.h> @@ -88,8 +87,7 @@ #define DefLogName L"rar.log" -#define PATHDIVIDER "\\" -#define PATHDIVIDERW L"\\" +#define SPATHDIVIDER L"\\" #define CPATHDIVIDER '\\' #define MASKALL L"*" @@ -130,7 +128,12 @@ #include <sys/sysctl.h> #endif #ifndef SFX_MODULE - #include <sys/statvfs.h> + #ifdef _ANDROID + #include <sys/vfs.h> + #define statvfs statfs + #else + #include <sys/statvfs.h> + #endif #endif #if defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined(__APPLE__) #endif @@ -161,8 +164,7 @@ #define DefLogName L".rarlog" -#define PATHDIVIDER "/" -#define PATHDIVIDERW L"/" +#define SPATHDIVIDER L"/" #define CPATHDIVIDER '/' #define MASKALL L"*" @@ -195,7 +197,7 @@ #endif - typedef const char* MSGID; + typedef const wchar* MSGID; #ifndef SSE_ALIGNMENT // No SSE use and no special data alignment is required. #define SSE_ALIGNMENT 1 @@ -233,15 +235,9 @@ #endif #endif -#if !defined(BIG_ENDIAN) && defined(_WIN_ALL) +#if !defined(BIG_ENDIAN) && defined(_WIN_ALL) || defined(__i386__) || defined(__x86_64__) // Allow not aligned integer access, increases speed in some operations. -#define ALLOW_NOT_ALIGNED_INT -#endif - -#if defined(__sparc) || defined(sparc) || defined(__sparcv9) -// Prohibit not aligned access to data structures in text compression -// algorithm, increases memory requirements. -#define STRICT_ALIGNMENT_REQUIRED +#define ALLOW_MISALIGNED #endif #endif // _RAR_OS_ |