From 16f26fb7621c8ee554f4d7c5b4c1972eb0ed7065 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Tue, 10 Nov 2015 13:17:41 -0800
Subject: Get rid of _FX_JPEG_TURBO_

Instead, set the libjpeg to use via GYP/GN.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1433803002 .
---
 third_party/libjpeg/fpdfapi_jcapimin.c | 3 ---
 third_party/libjpeg/fpdfapi_jcapistd.c | 3 ---
 third_party/libjpeg/fpdfapi_jccoefct.c | 3 ---
 third_party/libjpeg/fpdfapi_jccolor.c  | 3 ---
 third_party/libjpeg/fpdfapi_jcdctmgr.c | 3 ---
 third_party/libjpeg/fpdfapi_jchuff.c   | 3 ---
 third_party/libjpeg/fpdfapi_jcinit.c   | 3 ---
 third_party/libjpeg/fpdfapi_jcmainct.c | 3 ---
 third_party/libjpeg/fpdfapi_jcmarker.c | 3 ---
 third_party/libjpeg/fpdfapi_jcmaster.c | 3 ---
 third_party/libjpeg/fpdfapi_jcomapi.c  | 3 ---
 third_party/libjpeg/fpdfapi_jcparam.c  | 3 ---
 third_party/libjpeg/fpdfapi_jcphuff.c  | 3 ---
 third_party/libjpeg/fpdfapi_jcprepct.c | 3 ---
 third_party/libjpeg/fpdfapi_jcsample.c | 3 ---
 third_party/libjpeg/fpdfapi_jctrans.c  | 3 ---
 third_party/libjpeg/fpdfapi_jdapimin.c | 3 ---
 third_party/libjpeg/fpdfapi_jdapistd.c | 3 ---
 third_party/libjpeg/fpdfapi_jdcoefct.c | 3 ---
 third_party/libjpeg/fpdfapi_jdcolor.c  | 3 ---
 third_party/libjpeg/fpdfapi_jddctmgr.c | 3 ---
 third_party/libjpeg/fpdfapi_jdhuff.c   | 3 ---
 third_party/libjpeg/fpdfapi_jdinput.c  | 3 ---
 third_party/libjpeg/fpdfapi_jdmainct.c | 3 ---
 third_party/libjpeg/fpdfapi_jdmarker.c | 3 ---
 third_party/libjpeg/fpdfapi_jdmaster.c | 3 ---
 third_party/libjpeg/fpdfapi_jdmerge.c  | 3 ---
 third_party/libjpeg/fpdfapi_jdphuff.c  | 3 ---
 third_party/libjpeg/fpdfapi_jdpostct.c | 3 ---
 third_party/libjpeg/fpdfapi_jdsample.c | 3 ---
 third_party/libjpeg/fpdfapi_jdtrans.c  | 3 ---
 third_party/libjpeg/fpdfapi_jerror.c   | 3 ---
 third_party/libjpeg/fpdfapi_jfdctfst.c | 3 ---
 third_party/libjpeg/fpdfapi_jfdctint.c | 3 ---
 third_party/libjpeg/fpdfapi_jidctfst.c | 3 ---
 third_party/libjpeg/fpdfapi_jidctint.c | 3 ---
 third_party/libjpeg/fpdfapi_jidctred.c | 3 ---
 third_party/libjpeg/fpdfapi_jmemmgr.c  | 3 ---
 third_party/libjpeg/fpdfapi_jmemnobs.c | 3 ---
 third_party/libjpeg/fpdfapi_jutils.c   | 3 ---
 40 files changed, 120 deletions(-)

diff --git a/third_party/libjpeg/fpdfapi_jcapimin.c b/third_party/libjpeg/fpdfapi_jcapimin.c
index ec04fd2f15..54fb8c58c5 100644
--- a/third_party/libjpeg/fpdfapi_jcapimin.c
+++ b/third_party/libjpeg/fpdfapi_jcapimin.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcapimin.c
  *
@@ -279,5 +278,3 @@ jpeg_write_tables (j_compress_ptr cinfo)
    * each call to jpeg_write_tables().
    */
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcapistd.c b/third_party/libjpeg/fpdfapi_jcapistd.c
index 9d765e6f01..c0320b1b19 100644
--- a/third_party/libjpeg/fpdfapi_jcapistd.c
+++ b/third_party/libjpeg/fpdfapi_jcapistd.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcapistd.c
  *
@@ -160,5 +159,3 @@ jpeg_write_raw_data (j_compress_ptr cinfo, JSAMPIMAGE data,
   cinfo->next_scanline += lines_per_iMCU_row;
   return lines_per_iMCU_row;
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jccoefct.c b/third_party/libjpeg/fpdfapi_jccoefct.c
index 08910ef6f3..1963ddb61b 100644
--- a/third_party/libjpeg/fpdfapi_jccoefct.c
+++ b/third_party/libjpeg/fpdfapi_jccoefct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jccoefct.c
  *
@@ -448,5 +447,3 @@ jinit_c_coef_controller (j_compress_ptr cinfo, boolean need_full_buffer)
     coef->whole_image[0] = NULL; /* flag for no virtual arrays */
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jccolor.c b/third_party/libjpeg/fpdfapi_jccolor.c
index 809a05b5a1..0a8a4b5d13 100644
--- a/third_party/libjpeg/fpdfapi_jccolor.c
+++ b/third_party/libjpeg/fpdfapi_jccolor.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jccolor.c
  *
@@ -458,5 +457,3 @@ jinit_color_converter (j_compress_ptr cinfo)
     break;
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcdctmgr.c b/third_party/libjpeg/fpdfapi_jcdctmgr.c
index cbd7d11207..61fa79b9e6 100644
--- a/third_party/libjpeg/fpdfapi_jcdctmgr.c
+++ b/third_party/libjpeg/fpdfapi_jcdctmgr.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcdctmgr.c
  *
@@ -386,5 +385,3 @@ jinit_forward_dct (j_compress_ptr cinfo)
 #endif
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jchuff.c b/third_party/libjpeg/fpdfapi_jchuff.c
index 2a65aa253b..02d91e2cb4 100644
--- a/third_party/libjpeg/fpdfapi_jchuff.c
+++ b/third_party/libjpeg/fpdfapi_jchuff.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jchuff.c
  *
@@ -911,5 +910,3 @@ jinit_huff_encoder (j_compress_ptr cinfo)
 #endif
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcinit.c b/third_party/libjpeg/fpdfapi_jcinit.c
index 58e5d18764..5efffe3316 100644
--- a/third_party/libjpeg/fpdfapi_jcinit.c
+++ b/third_party/libjpeg/fpdfapi_jcinit.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcinit.c
  *
@@ -71,5 +70,3 @@ jinit_compress_master (j_compress_ptr cinfo)
    */
   (*cinfo->marker->write_file_header) (cinfo);
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcmainct.c b/third_party/libjpeg/fpdfapi_jcmainct.c
index 4bf2c403ea..e0279a7e01 100644
--- a/third_party/libjpeg/fpdfapi_jcmainct.c
+++ b/third_party/libjpeg/fpdfapi_jcmainct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcmainct.c
  *
@@ -292,5 +291,3 @@ jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
     }
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcmarker.c b/third_party/libjpeg/fpdfapi_jcmarker.c
index f1c89d92a9..3d1e6c6d52 100644
--- a/third_party/libjpeg/fpdfapi_jcmarker.c
+++ b/third_party/libjpeg/fpdfapi_jcmarker.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcmarker.c
  *
@@ -663,5 +662,3 @@ jinit_marker_writer (j_compress_ptr cinfo)
   /* Initialize private state */
   marker->last_restart_interval = 0;
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcmaster.c b/third_party/libjpeg/fpdfapi_jcmaster.c
index 45322a53b3..aab4020b87 100644
--- a/third_party/libjpeg/fpdfapi_jcmaster.c
+++ b/third_party/libjpeg/fpdfapi_jcmaster.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcmaster.c
  *
@@ -589,5 +588,3 @@ jinit_c_master_control (j_compress_ptr cinfo, boolean transcode_only)
   else
     master->total_passes = cinfo->num_scans;
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcomapi.c b/third_party/libjpeg/fpdfapi_jcomapi.c
index aad37d8879..9b1fa7568a 100644
--- a/third_party/libjpeg/fpdfapi_jcomapi.c
+++ b/third_party/libjpeg/fpdfapi_jcomapi.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcomapi.c
  *
@@ -105,5 +104,3 @@ jpeg_alloc_huff_table (j_common_ptr cinfo)
   tbl->sent_table = FALSE;	/* make sure this is false in any new table */
   return tbl;
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcparam.c b/third_party/libjpeg/fpdfapi_jcparam.c
index f3ea109878..6fc48f5365 100644
--- a/third_party/libjpeg/fpdfapi_jcparam.c
+++ b/third_party/libjpeg/fpdfapi_jcparam.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcparam.c
  *
@@ -609,5 +608,3 @@ jpeg_simple_progression (j_compress_ptr cinfo)
 }
 
 #endif /* C_PROGRESSIVE_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcphuff.c b/third_party/libjpeg/fpdfapi_jcphuff.c
index 6d89b6b2c0..07f9178b01 100644
--- a/third_party/libjpeg/fpdfapi_jcphuff.c
+++ b/third_party/libjpeg/fpdfapi_jcphuff.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcphuff.c
  *
@@ -832,5 +831,3 @@ jinit_phuff_encoder (j_compress_ptr cinfo)
 }
 
 #endif /* C_PROGRESSIVE_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcprepct.c b/third_party/libjpeg/fpdfapi_jcprepct.c
index 57f3fc1108..fa93333db2 100644
--- a/third_party/libjpeg/fpdfapi_jcprepct.c
+++ b/third_party/libjpeg/fpdfapi_jcprepct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcprepct.c
  *
@@ -353,5 +352,3 @@ jinit_c_prep_controller (j_compress_ptr cinfo, boolean need_full_buffer)
     }
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcsample.c b/third_party/libjpeg/fpdfapi_jcsample.c
index 5e1e828740..212ec8757c 100644
--- a/third_party/libjpeg/fpdfapi_jcsample.c
+++ b/third_party/libjpeg/fpdfapi_jcsample.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jcsample.c
  *
@@ -518,5 +517,3 @@ jinit_downsampler (j_compress_ptr cinfo)
     TRACEMS(cinfo, 0, JTRC_SMOOTH_NOTIMPL);
 #endif
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jctrans.c b/third_party/libjpeg/fpdfapi_jctrans.c
index 40d166736b..0e6d70769d 100644
--- a/third_party/libjpeg/fpdfapi_jctrans.c
+++ b/third_party/libjpeg/fpdfapi_jctrans.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jctrans.c
  *
@@ -387,5 +386,3 @@ transencode_coef_controller (j_compress_ptr cinfo,
     coef->dummy_buffer[i] = buffer + i;
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdapimin.c b/third_party/libjpeg/fpdfapi_jdapimin.c
index 80c52cd29f..cadb59fce3 100644
--- a/third_party/libjpeg/fpdfapi_jdapimin.c
+++ b/third_party/libjpeg/fpdfapi_jdapimin.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdapimin.c
  *
@@ -394,5 +393,3 @@ jpeg_finish_decompress (j_decompress_ptr cinfo)
   jpeg_abort((j_common_ptr) cinfo);
   return TRUE;
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdapistd.c b/third_party/libjpeg/fpdfapi_jdapistd.c
index 4c31f7640c..39bbb969bf 100644
--- a/third_party/libjpeg/fpdfapi_jdapistd.c
+++ b/third_party/libjpeg/fpdfapi_jdapistd.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdapistd.c
  *
@@ -275,5 +274,3 @@ jpeg_finish_output (j_decompress_ptr cinfo)
 }
 
 #endif /* D_MULTISCAN_FILES_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdcoefct.c b/third_party/libjpeg/fpdfapi_jdcoefct.c
index 099833a8d6..4938d20fcb 100644
--- a/third_party/libjpeg/fpdfapi_jdcoefct.c
+++ b/third_party/libjpeg/fpdfapi_jdcoefct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdcoefct.c
  *
@@ -735,5 +734,3 @@ jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
     coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdcolor.c b/third_party/libjpeg/fpdfapi_jdcolor.c
index c17329b86d..6c04dfe8aa 100644
--- a/third_party/libjpeg/fpdfapi_jdcolor.c
+++ b/third_party/libjpeg/fpdfapi_jdcolor.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdcolor.c
  *
@@ -395,5 +394,3 @@ jinit_color_deconverter (j_decompress_ptr cinfo)
   else
     cinfo->output_components = cinfo->out_color_components;
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jddctmgr.c b/third_party/libjpeg/fpdfapi_jddctmgr.c
index 5226456414..bbf8d0e92f 100644
--- a/third_party/libjpeg/fpdfapi_jddctmgr.c
+++ b/third_party/libjpeg/fpdfapi_jddctmgr.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jddctmgr.c
  *
@@ -268,5 +267,3 @@ jinit_inverse_dct (j_decompress_ptr cinfo)
     idct->cur_method[ci] = -1;
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdhuff.c b/third_party/libjpeg/fpdfapi_jdhuff.c
index dc37db58a9..4b0454d5a0 100644
--- a/third_party/libjpeg/fpdfapi_jdhuff.c
+++ b/third_party/libjpeg/fpdfapi_jdhuff.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdhuff.c
  *
@@ -653,5 +652,3 @@ jinit_huff_decoder (j_decompress_ptr cinfo)
     entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdinput.c b/third_party/libjpeg/fpdfapi_jdinput.c
index 6e714e928e..0c2ac8f120 100644
--- a/third_party/libjpeg/fpdfapi_jdinput.c
+++ b/third_party/libjpeg/fpdfapi_jdinput.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdinput.c
  *
@@ -380,5 +379,3 @@ jinit_input_controller (j_decompress_ptr cinfo)
   inputctl->pub.eoi_reached = FALSE;
   inputctl->inheaders = TRUE;
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdmainct.c b/third_party/libjpeg/fpdfapi_jdmainct.c
index 1483e6fff0..13c956f5de 100644
--- a/third_party/libjpeg/fpdfapi_jdmainct.c
+++ b/third_party/libjpeg/fpdfapi_jdmainct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdmainct.c
  *
@@ -511,5 +510,3 @@ jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
 			 (JDIMENSION) (rgroup * ngroups));
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdmarker.c b/third_party/libjpeg/fpdfapi_jdmarker.c
index bcd017f920..449a3c0f68 100644
--- a/third_party/libjpeg/fpdfapi_jdmarker.c
+++ b/third_party/libjpeg/fpdfapi_jdmarker.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdmarker.c
  *
@@ -1392,5 +1391,3 @@ jpeg_set_marker_processor (j_decompress_ptr cinfo, int marker_code,
   else
     ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdmaster.c b/third_party/libjpeg/fpdfapi_jdmaster.c
index dae51e0fd2..2802c5b7b2 100644
--- a/third_party/libjpeg/fpdfapi_jdmaster.c
+++ b/third_party/libjpeg/fpdfapi_jdmaster.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdmaster.c
  *
@@ -556,5 +555,3 @@ jinit_master_decompress (j_decompress_ptr cinfo)
 
   master_selection(cinfo);
 }
-
-#endif //_FX_JPEG_TURBO_
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_
diff --git a/third_party/libjpeg/fpdfapi_jdphuff.c b/third_party/libjpeg/fpdfapi_jdphuff.c
index 128e412662..2267809945 100644
--- a/third_party/libjpeg/fpdfapi_jdphuff.c
+++ b/third_party/libjpeg/fpdfapi_jdphuff.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdphuff.c
  *
@@ -667,5 +666,3 @@ jinit_phuff_decoder (j_decompress_ptr cinfo)
 }
 
 #endif /* D_PROGRESSIVE_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdpostct.c b/third_party/libjpeg/fpdfapi_jdpostct.c
index 13b1b1bb0c..571563d728 100644
--- a/third_party/libjpeg/fpdfapi_jdpostct.c
+++ b/third_party/libjpeg/fpdfapi_jdpostct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdpostct.c
  *
@@ -289,5 +288,3 @@ jinit_d_post_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
     }
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdsample.c b/third_party/libjpeg/fpdfapi_jdsample.c
index da9c38ce38..80ffefb2a1 100644
--- a/third_party/libjpeg/fpdfapi_jdsample.c
+++ b/third_party/libjpeg/fpdfapi_jdsample.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdsample.c
  *
@@ -477,5 +476,3 @@ jinit_upsampler (j_decompress_ptr cinfo)
     }
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdtrans.c b/third_party/libjpeg/fpdfapi_jdtrans.c
index ae44f36043..6c0ab715d3 100644
--- a/third_party/libjpeg/fpdfapi_jdtrans.c
+++ b/third_party/libjpeg/fpdfapi_jdtrans.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jdtrans.c
  *
@@ -142,5 +141,3 @@ transdecode_master_selection (j_decompress_ptr cinfo)
     cinfo->progress->total_passes = 1;
   }
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jerror.c b/third_party/libjpeg/fpdfapi_jerror.c
index 282f889ebd..adfb9fe19d 100644
--- a/third_party/libjpeg/fpdfapi_jerror.c
+++ b/third_party/libjpeg/fpdfapi_jerror.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jerror.c
  *
@@ -238,5 +237,3 @@ jpeg_std_error (struct jpeg_error_mgr * err)
 
   return err;
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jfdctfst.c b/third_party/libjpeg/fpdfapi_jfdctfst.c
index b978b468d7..ccb378a3b4 100644
--- a/third_party/libjpeg/fpdfapi_jfdctfst.c
+++ b/third_party/libjpeg/fpdfapi_jfdctfst.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jfdctfst.c
  *
@@ -223,5 +222,3 @@ jpeg_fdct_ifast (DCTELEM * data)
 }
 
 #endif /* DCT_IFAST_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jfdctint.c b/third_party/libjpeg/fpdfapi_jfdctint.c
index 488505b062..0a78b64aee 100644
--- a/third_party/libjpeg/fpdfapi_jfdctint.c
+++ b/third_party/libjpeg/fpdfapi_jfdctint.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jfdctint.c
  *
@@ -282,5 +281,3 @@ jpeg_fdct_islow (DCTELEM * data)
 }
 
 #endif /* DCT_ISLOW_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jidctfst.c b/third_party/libjpeg/fpdfapi_jidctfst.c
index 26a8f68a27..dba4216fb9 100644
--- a/third_party/libjpeg/fpdfapi_jidctfst.c
+++ b/third_party/libjpeg/fpdfapi_jidctfst.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jidctfst.c
  *
@@ -367,5 +366,3 @@ jpeg_idct_ifast (j_decompress_ptr cinfo, jpeg_component_info * compptr,
 }
 
 #endif /* DCT_IFAST_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jidctint.c b/third_party/libjpeg/fpdfapi_jidctint.c
index 78a8d66552..a72b3207ca 100644
--- a/third_party/libjpeg/fpdfapi_jidctint.c
+++ b/third_party/libjpeg/fpdfapi_jidctint.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jidctint.c
  *
@@ -388,5 +387,3 @@ jpeg_idct_islow (j_decompress_ptr cinfo, jpeg_component_info * compptr,
 }
 
 #endif /* DCT_ISLOW_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jidctred.c b/third_party/libjpeg/fpdfapi_jidctred.c
index 8b4b807192..421f3c7ca1 100644
--- a/third_party/libjpeg/fpdfapi_jidctred.c
+++ b/third_party/libjpeg/fpdfapi_jidctred.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jidctred.c
  *
@@ -397,5 +396,3 @@ jpeg_idct_1x1 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
 }
 
 #endif /* IDCT_SCALING_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
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_
diff --git a/third_party/libjpeg/fpdfapi_jmemnobs.c b/third_party/libjpeg/fpdfapi_jmemnobs.c
index f1f789a1a6..201c5d6882 100644
--- a/third_party/libjpeg/fpdfapi_jmemnobs.c
+++ b/third_party/libjpeg/fpdfapi_jmemnobs.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jmemnobs.c
  *
@@ -122,5 +121,3 @@ jpeg_mem_term (j_common_ptr cinfo)
 {
   /* no work */
 }
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jutils.c b/third_party/libjpeg/fpdfapi_jutils.c
index c6f7248af8..d18a955562 100644
--- a/third_party/libjpeg/fpdfapi_jutils.c
+++ b/third_party/libjpeg/fpdfapi_jutils.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
 /*
  * jutils.c
  *
@@ -178,5 +177,3 @@ jzero_far (void FAR * target, size_t bytestozero)
   }
 #endif
 }
-
-#endif //_FX_JPEG_TURBO_
-- 
cgit v1.2.3