summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 02:41:57 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 02:41:57 +0000
commit8d127305a31b1c129d2cc40908f9fc6fc74a3c0f (patch)
treecb09daa9a0be9e46d57f3e313769426293f0addb /net/tools
parent21456cb1837d0f0647e25de9f50b8bb786f1a660 (diff)
downloadchromium_src-8d127305a31b1c129d2cc40908f9fc6fc74a3c0f.zip
chromium_src-8d127305a31b1c129d2cc40908f9fc6fc74a3c0f.tar.gz
chromium_src-8d127305a31b1c129d2cc40908f9fc6fc74a3c0f.tar.bz2
Only define ERROR on windows builds
This is to stop people accidentally using the ERROR macro for other uses, e.g. VLOG(ERROR) is not meaningful. BUG= Review URL: https://chromiumcodereview.appspot.com/11669010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/flip_server/balsa_frame.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tools/flip_server/balsa_frame.cc b/net/tools/flip_server/balsa_frame.cc
index 302124d..d33b03e 100644
--- a/net/tools/flip_server/balsa_frame.cc
+++ b/net/tools/flip_server/balsa_frame.cc
@@ -85,8 +85,8 @@ void BalsaFrame::Reset() {
const char* BalsaFrameEnums::ParseStateToString(
BalsaFrameEnums::ParseState error_code) {
switch (error_code) {
- case ERROR:
- return "ERROR";
+ case PARSE_ERROR:
+ return "PARSE_ERROR";
case READING_HEADER_AND_FIRSTLINE:
return "READING_HEADER_AND_FIRSTLINE";
case READING_CHUNK_LENGTH: