summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-26 16:19:41 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-26 20:42:02 +0000
commit3070e94f608f36e7312fad2d471e3d7546f82ca2 (patch)
tree9e135b68f22706ef5701c352a93506627e76fb05
parent2e4075dea6c988c1e573038af23f561a286daa19 (diff)
downloadpdfium-3070e94f608f36e7312fad2d471e3d7546f82ca2.tar.xz
Remove _FX_IOS_chromium/3225
The _FX_IOS_ define is never defined, so it isn't useful to check _FX_OS_ against. Remove. Change-Id: I90b50a1a0dc165073ed223cbfe861b9a227818dd Reviewed-on: https://pdfium-review.googlesource.com/14831 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
-rw-r--r--core/fxcodec/codec/fx_codec_progress.cpp6
-rw-r--r--core/fxcrt/cfx_datetime.cpp2
-rw-r--r--fxbarcode/utils.h9
3 files changed, 8 insertions, 9 deletions
diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
index 0f2f56122b..d93d46d57a 100644
--- a/core/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/fxcodec/codec/fx_codec_progress.cpp
@@ -22,11 +22,11 @@
namespace {
-#if _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
+#if _FX_OS_ == _FX_MACOSX_
const double kPngGamma = 1.7;
-#else // _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
+#else // _FX_OS_ == _FX_MACOSX_
const double kPngGamma = 2.2;
-#endif // _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
+#endif // _FX_OS_ == _FX_MACOSX_
void RGB2BGR(uint8_t* buffer, int width = 1) {
if (buffer && width > 0) {
diff --git a/core/fxcrt/cfx_datetime.cpp b/core/fxcrt/cfx_datetime.cpp
index c6233971bd..beba3654a4 100644
--- a/core/fxcrt/cfx_datetime.cpp
+++ b/core/fxcrt/cfx_datetime.cpp
@@ -8,7 +8,7 @@
#include "core/fxcrt/fx_system.h"
#if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || \
- _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_
+ _FX_OS_ == _FX_MACOSX_
#include <sys/time.h>
#include <time.h>
#endif
diff --git a/fxbarcode/utils.h b/fxbarcode/utils.h
index 6140dd0904..ec3992805e 100644
--- a/fxbarcode/utils.h
+++ b/fxbarcode/utils.h
@@ -21,15 +21,14 @@ void BC_FX_ByteString_Append(ByteString& dst, const std::vector<uint8_t>& ba);
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#include <limits>
-#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ || \
- _FX_OS_ == _FX_IOS_
+#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_
#include <limits.h>
#endif
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#define FXSYS_isnan(x) _isnan(x)
-#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ || \
- _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_
+#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ || \
+ _FX_OS_ == _FX_ANDROID_
#include <cmath>
#define FXSYS_isnan(x) std::isnan(x)
#endif
@@ -37,7 +36,7 @@ void BC_FX_ByteString_Append(ByteString& dst, const std::vector<uint8_t>& ba);
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#define FXSYS_nan() (std::numeric_limits<float>::quiet_NaN())
#elif _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_LINUX_DESKTOP_ || \
- _FX_OS_ == _FX_IOS_ || _FX_OS_ == _FX_ANDROID_
+ _FX_OS_ == _FX_ANDROID_
#define FXSYS_nan() NAN
#endif