diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-07-10 01:30:44 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-10 01:30:44 +0000 |
| commit | c9297e896c697b5bb9c3b9e66791a834f5552170 (patch) | |
| tree | 07cbc8ee88c68f015a17cebd979ef4952088cb7f /core/fxcrt | |
| parent | 43f6bc80a29fdf326729903e9f323850e9553c69 (diff) | |
| download | pdfium-c9297e896c697b5bb9c3b9e66791a834f5552170.tar.xz | |
Fix duplicate symbols in Chromium builds.
Commit 43f6bc80 copied over Chromium's base/debug/alias.cc, but that
confuses Windows builds and Linux jumbo builds in Chromium.
To fix this, wrap PDFium's copy in the pdfium namespace.
BUG=chromium:860850
TBR=dsinclair@chromium.org
Change-Id: I1ceec28b9ce6c2893bf030a5b6564dce6d6ec376
Reviewed-on: https://pdfium-review.googlesource.com/37430
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcrt')
| -rw-r--r-- | core/fxcrt/fx_memory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/fxcrt/fx_memory.cpp b/core/fxcrt/fx_memory.cpp index 4c7b36855c..c0ca7a02df 100644 --- a/core/fxcrt/fx_memory.cpp +++ b/core/fxcrt/fx_memory.cpp @@ -49,7 +49,7 @@ NEVER_INLINE void FX_OutOfMemoryTerminate() { // Convince the linker this should not be folded with similar functions using // Identical Code Folding. static int make_this_function_aliased = 0xbd; - base::debug::Alias(&make_this_function_aliased); + pdfium::base::debug::Alias(&make_this_function_aliased); // Termimate cleanly if we can, else crash at a specific address (0xbd). abort(); |