summaryrefslogtreecommitdiff
path: root/third_party/libjpeg/fpdfapi_jdmerge.c
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-01-15 12:05:25 -0800
committerLei Zhang <thestig@chromium.org>2016-01-15 12:05:25 -0800
commit199e56432353c68a9bac9061cbdae1f9b700fbe5 (patch)
tree642d198d1f2e12122b3790d6442d86f4e1d69a32 /third_party/libjpeg/fpdfapi_jdmerge.c
parenta943a2516e5483012e0fbef7e8fafbed1b22ed95 (diff)
downloadpdfium-199e56432353c68a9bac9061cbdae1f9b700fbe5.tar.xz
Remove ifdefs for _FX_MANAGED_CODE_.
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1589223002 .
Diffstat (limited to 'third_party/libjpeg/fpdfapi_jdmerge.c')
-rw-r--r--third_party/libjpeg/fpdfapi_jdmerge.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/third_party/libjpeg/fpdfapi_jdmerge.c b/third_party/libjpeg/fpdfapi_jdmerge.c
index 519bbad685..a175a56bf7 100644
--- a/third_party/libjpeg/fpdfapi_jdmerge.c
+++ b/third_party/libjpeg/fpdfapi_jdmerge.c
@@ -38,10 +38,6 @@
#ifdef UPSAMPLE_MERGING_SUPPORTED
-#ifdef _FX_MANAGED_CODE_
-#define my_upsampler my_upsampler_m
-#endif
-
/* Private subobject */
typedef struct {