summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-08-03 12:24:10 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-08-03 19:39:02 +0000
commit844d5dac8a6c97b2cd3bd92bf07d0cc62158408a (patch)
tree03c94f7b3cb390cba9e24b774ea61e7cb17fbf72
parent6c740e29640ceb392c1845e120eaab6f981b6551 (diff)
downloadpdfium-844d5dac8a6c97b2cd3bd92bf07d0cc62158408a.tar.xz
kill some stray __native_client__ defines
There isn't any work to NaCl PDFium at the moment, and it would take a lot more than these few changes. Change-Id: I6c4bf5f38bbfb9cf4f5a5688128c7720c38a8ce4 Reviewed-on: https://pdfium-review.googlesource.com/10050 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
-rw-r--r--core/fxcrt/fx_basic_util.cpp3
-rw-r--r--core/fxcrt/fx_system.h3
2 files changed, 1 insertions, 5 deletions
diff --git a/core/fxcrt/fx_basic_util.cpp b/core/fxcrt/fx_basic_util.cpp
index 7730866c73..9491e36e71 100644
--- a/core/fxcrt/fx_basic_util.cpp
+++ b/core/fxcrt/fx_basic_util.cpp
@@ -177,9 +177,6 @@ bool FX_GetNextFile(FX_FileHandle* handle,
if (!FindNextFileA(handle->m_Handle, &handle->m_FindData))
handle->m_bEnd = true;
return true;
-#elif defined(__native_client__)
- abort();
- return false;
#else
struct dirent* de = readdir(handle);
if (!de)
diff --git a/core/fxcrt/fx_system.h b/core/fxcrt/fx_system.h
index e9288641b8..a3dc21bb46 100644
--- a/core/fxcrt/fx_system.h
+++ b/core/fxcrt/fx_system.h
@@ -283,8 +283,7 @@ int FXSYS_round(float f);
// Handle differnces between platform's variadic function implementations.
#if defined(__ARMCC_VERSION) || \
(!defined(_MSC_VER) && (_FX_CPU_ == _FX_X64_ || _FX_CPU_ == _FX_IA64_ || \
- _FX_CPU_ == _FX_ARM64_)) || \
- defined(__native_client__)
+ _FX_CPU_ == _FX_ARM64_))
#define FX_VA_COPY(dst, src) va_copy((dst), (src))
#else
#define FX_VA_COPY(dst, src) ((dst) = (src))