From fb1cd014b48942572fe49bf2739ad7550a3a6bce Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Nov 2015 13:20:33 -0800 Subject: Merge to XFA: Get rid of _FX_JPEG_TURBO_ Instead, set the libjpeg to use via GYP/GN. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1433803002 . (cherry picked from commit 16f26fb7621c8ee554f4d7c5b4c1972eb0ed7065) Review URL: https://codereview.chromium.org/1409323010 . --- third_party/libjpeg/fpdfapi_jmemmgr.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'third_party/libjpeg/fpdfapi_jmemmgr.c') diff --git a/third_party/libjpeg/fpdfapi_jmemmgr.c b/third_party/libjpeg/fpdfapi_jmemmgr.c index 630102fc2e..47ead48ac4 100644 --- a/third_party/libjpeg/fpdfapi_jmemmgr.c +++ b/third_party/libjpeg/fpdfapi_jmemmgr.c @@ -1,4 +1,3 @@ -#if !defined(_FX_JPEG_TURBO_) /* * jmemmgr.c * @@ -1119,5 +1118,3 @@ jinit_memory_mgr (j_common_ptr cinfo) #endif } - -#endif //_FX_JPEG_TURBO_ -- cgit v1.2.3