Chromium Code Reviews| Index: third_party/libjpeg/fpdfapi_jdmerge.c |
| diff --git a/third_party/libjpeg/fpdfapi_jdmerge.c b/third_party/libjpeg/fpdfapi_jdmerge.c |
| index 519bbad685388b5d4c383bc485880748cd502e88..a175a56bf793a3e762ab963616a8b42e9bd5f715 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 { |