From 27036e33e86c9ce3b5087d55c18bf04964343c60 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Thu, 3 Aug 2017 22:00:31 +0000 Subject: [PATCH] Revert "include header for benefit of new clang builds" This reverts commit 1dda4cb0b7bd564e646d6ec2efee497fcd7146ca. Reason for revert: build error on jpeg FILE Original change's description: > include header for benefit of new clang builds > > TBR=kjellander@chromium.org > BUG=libyuv:712 > TEST=local builds still work > > Change-Id: I040e8edc40aafd820d2a29629fe7aec5c049bc6b > Reviewed-on: https://chromium-review.googlesource.com/576971 > Reviewed-by: Frank Barchard > Commit-Queue: Frank Barchard TBR=kjellander@chromium.org,fbarchard@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: libyuv:712 Change-Id: I4cf4e26eadb476017dc95e6c9578092204f088a3 Reviewed-on: https://chromium-review.googlesource.com/601211 Commit-Queue: Frank Barchard Reviewed-by: Frank Barchard --- source/mjpeg_decoder.cc | 4 ---- util/psnr_main.cc | 1 - util/yuvconvert.cc | 1 - 3 files changed, 6 deletions(-) diff --git a/source/mjpeg_decoder.cc b/source/mjpeg_decoder.cc index 67568b413..b43c008bd 100644 --- a/source/mjpeg_decoder.cc +++ b/source/mjpeg_decoder.cc @@ -13,10 +13,6 @@ #ifdef HAVE_JPEG #include -#ifdef __cplusplus -#include -#endif - #if !defined(__pnacl__) && !defined(__CLR_VER) && \ !defined(COVERAGE_ENABLED) && !defined(TARGET_IPHONE_SIMULATOR) // Must be included before jpeglib. diff --git a/util/psnr_main.cc b/util/psnr_main.cc index 6d32f1f05..4d930be4a 100644 --- a/util/psnr_main.cc +++ b/util/psnr_main.cc @@ -22,7 +22,6 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include #include #include #include diff --git a/util/yuvconvert.cc b/util/yuvconvert.cc index 7f0aadabc..bc01d9ff5 100644 --- a/util/yuvconvert.cc +++ b/util/yuvconvert.cc @@ -15,7 +15,6 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include #include #include #include