summaryrefslogtreecommitdiff
path: root/third_party/libjpeg/fpdfapi_jdmerge.c
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/libjpeg/fpdfapi_jdmerge.c')
-rw-r--r--third_party/libjpeg/fpdfapi_jdmerge.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/third_party/libjpeg/fpdfapi_jdmerge.c b/third_party/libjpeg/fpdfapi_jdmerge.c
index c229f86aa5..519bbad685 100644
--- a/third_party/libjpeg/fpdfapi_jdmerge.c
+++ b/third_party/libjpeg/fpdfapi_jdmerge.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdmerge.c
*
@@ -402,5 +401,3 @@ jinit_merged_upsampler (j_decompress_ptr cinfo)
}
#endif /* UPSAMPLE_MERGING_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_