zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unbreaks linux.cc in Chromium.

Browse Source 
BUG=N/A
R=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6823 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-08-04 21:51:14 +00:00
parent b18bf5e47d
commit d6542852f3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/base/linux.cc
View File

@ -233,7 +233,7 @@ bool ConfigParser::ParseLine(std::string* key, std::string* value) {
return true; return true;
} }
#if !defined(WEBRTC_CHROMIUM_BUILDs) #if !defined(WEBRTC_CHROMIUM_BUILD)
static bool ExpectLineFromStream(FileStream* stream, static bool ExpectLineFromStream(FileStream* stream,
std::string* out) { std::string* out) {
StreamResult res = stream->ReadLine(out); StreamResult res = stream->ReadLine(out);

2
webrtc/base/linux.h
View File

@ -104,7 +104,7 @@ class ProcCpuInfo {
ConfigParser::MapVector sections_; ConfigParser::MapVector sections_;
}; };
#if !defined(WEBRTC_CHROMIUM_BUILDs) #if !defined(WEBRTC_CHROMIUM_BUILD)
// Builds a string containing the info from lsb_release on a single line. // Builds a string containing the info from lsb_release on a single line.
std::string ReadLinuxLsbRelease(); std::string ReadLinuxLsbRelease();
#endif #endif

2
webrtc/base/linux_unittest.cc
View File

@ -88,7 +88,7 @@ TEST(ConfigParser, ParseConfig) {
EXPECT_EQ(true, parser.Parse(&key_val_pairs)); EXPECT_EQ(true, parser.Parse(&key_val_pairs));
} }
#if !defined(WEBRTC_CHROMIUM_BUILDs) #if !defined(WEBRTC_CHROMIUM_BUILD)
TEST(ReadLinuxLsbRelease, ReturnsSomething) { TEST(ReadLinuxLsbRelease, ReturnsSomething) {
std::string str = ReadLinuxLsbRelease(); std::string str = ReadLinuxLsbRelease();
// ChromeOS don't have lsb_release // ChromeOS don't have lsb_release