diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/third_party/unrar | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/unrar')
| -rw-r--r-- | chromium/third_party/unrar/patches/chromium_changes.patch | 2 | ||||
| -rw-r--r-- | chromium/third_party/unrar/src/errhnd.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/unrar/patches/chromium_changes.patch b/chromium/third_party/unrar/patches/chromium_changes.patch index 2c0a48e9834..35c75e361e1 100644 --- a/chromium/third_party/unrar/patches/chromium_changes.patch +++ b/chromium/third_party/unrar/patches/chromium_changes.patch @@ -104,7 +104,7 @@ index ef1c372ae491..55f098961657 100644 +// NOTE(vakh): The process.h file needs to be included first because "rar.hpp" +// defines certain macros that cause symbol redefinition errors +#if defined(UNRAR_NO_EXCEPTIONS) -+#include "base/logging.h" ++#include "base/check.h" +#include "base/process/process.h" +#endif // defined(UNRAR_NO_EXCEPTIONS) diff --git a/chromium/third_party/unrar/src/errhnd.cpp b/chromium/third_party/unrar/src/errhnd.cpp index 9a30acdb5ee..8ccdaa7377d 100644 --- a/chromium/third_party/unrar/src/errhnd.cpp +++ b/chromium/third_party/unrar/src/errhnd.cpp @@ -1,7 +1,7 @@ // NOTE(vakh): The process.h file needs to be included first because "rar.hpp" // defines certain macros that cause symbol redefinition errors #if defined(UNRAR_NO_EXCEPTIONS) -#include "base/logging.h" +#include "base/check.h" #include "base/process/process.h" #endif // defined(UNRAR_NO_EXCEPTIONS) |