admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include gflags properly and X11 include order in VideoEngine.

Browse Source 
BUG=

TBR=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1500004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4057 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-05-17 14:25:02 +00:00
parent f5d4cb1958
commit 21632124dd
9 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
View File

@ -10,7 +10,7 @@
#include <ctime>
#include "testing/gflags/include/gflags/gflags.h"
#include <gflags/gflags.h>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/libtest/include/bit_flip_encryption.h"
#include "webrtc/test/libtest/include/random_encryption.h"

2
webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
View File

@ -15,7 +15,7 @@
#include <cstdio>
#include "testing/gflags/include/gflags/gflags.h"
#include <gflags/gflags.h>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/testsupport/metrics/video_metrics.h"
#include "webrtc/test/testsupport/metrics/video_metrics.h"

2
webrtc/video_engine/test/auto_test/interface/vie_autotest.h
View File

@ -15,7 +15,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_H_
#include "testing/gflags/include/gflags/gflags.h"
#include <gflags/gflags.h>
#include "webrtc/common_types.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include "webrtc/video_engine/include/vie_base.h"

4
webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h
View File

@ -11,9 +11,11 @@
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_LINUX_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_LINUX_H_
// Note(pbos): This MUST be included before the X11 headers
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
// Forward declaration

2
webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
View File

@ -16,7 +16,7 @@
#include <algorithm>
#include "testing/gflags/include/gflags/gflags.h"
#include <gflags/gflags.h>
namespace webrtc {

2
webrtc/video_engine/test/auto_test/primitives/input_helpers.h
View File

@ -17,7 +17,7 @@
#include <string>
#include <vector>
#include "testing/gflags/include/gflags/gflags.h"
#include <gflags/gflags.h>
namespace webrtc {

2
webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "testing/gflags/include/gflags/gflags.h"
#include <gflags/gflags.h>
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_capture/include/video_capture_factory.h"

2
webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
View File

@ -14,7 +14,7 @@
#include <algorithm>
#include "testing/gflags/include/gflags/gflags.h"
#include <gflags/gflags.h>
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"

2
webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc
View File

@ -10,7 +10,7 @@
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
#include "testing/gflags/include/gflags/gflags.h"
#include <gflags/gflags.h>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"