diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 04:05:27 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 04:05:27 +0000 |
| commit | 175b1ce2327e4cbcad0851fa03b02021b2fe50c3 (patch) | |
| tree | 40ffcec5eba66a68d82c394dbce628f31e1cc3c9 /net | |
| parent | 80583bde508bf84f3f3745e50ca0ca41cb141feb (diff) | |
| download | chromium_src-175b1ce2327e4cbcad0851fa03b02021b2fe50c3.zip chromium_src-175b1ce2327e4cbcad0851fa03b02021b2fe50c3.tar.gz chromium_src-175b1ce2327e4cbcad0851fa03b02021b2fe50c3.tar.bz2 | |
Protect header that requires SSE2 on gcc4.4 and remove unused header.
This fixes a compile error on the new 32-bit Lucid buildbots:
In file included from net/tools/flip_server/balsa_headers.cc:7:
/usr/lib/gcc/i486-linux-gnu/4.4.3/include/emmintrin.h:32:3: error: #error "SSE2 instruction set not enabled"
In file included from net/tools/flip_server/balsa_frame.cc:8:
/usr/lib/gcc/i486-linux-gnu/4.4.3/include/emmintrin.h:32:3: error: #error "SSE2 instruction set not enabled"
BUG=
TEST=Lucid builbot compiles
Review URL: http://codereview.chromium.org/6677116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/tools/flip_server/balsa_frame.cc | 5 | ||||
| -rw-r--r-- | net/tools/flip_server/balsa_headers.cc | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/net/tools/flip_server/balsa_frame.cc b/net/tools/flip_server/balsa_frame.cc index 6a46685..302124d 100644 --- a/net/tools/flip_server/balsa_frame.cc +++ b/net/tools/flip_server/balsa_frame.cc @@ -1,11 +1,13 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "net/tools/flip_server/balsa_frame.h" #include <assert.h> +#if __SSE2__ #include <emmintrin.h> +#endif // __SSE2__ #include <strings.h> #include <limits> @@ -1593,4 +1595,3 @@ const uint32 BalsaFrame::kValidTerm2; const uint32 BalsaFrame::kValidTerm2Mask; } // namespace net - diff --git a/net/tools/flip_server/balsa_headers.cc b/net/tools/flip_server/balsa_headers.cc index 80a68fa..a8e90fb 100644 --- a/net/tools/flip_server/balsa_headers.cc +++ b/net/tools/flip_server/balsa_headers.cc @@ -1,11 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "net/tools/flip_server/balsa_headers.h" -#include <emmintrin.h> - #include <algorithm> #include <ext/hash_set> #include <string> |