diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 20:34:39 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 20:34:39 +0000 |
| commit | 91136d35aa4750c172c9cc709ae2e89d892923df (patch) | |
| tree | aeab29c8dade042475a353737ec60d21aed23a3f /chrome/common/gfx | |
| parent | 6752e8bf9229eb6beafeedf03dccecc9cf7e9956 (diff) | |
| download | chromium_src-91136d35aa4750c172c9cc709ae2e89d892923df.zip chromium_src-91136d35aa4750c172c9cc709ae2e89d892923df.tar.gz chromium_src-91136d35aa4750c172c9cc709ae2e89d892923df.tar.bz2 | |
Reverting 7083,7079.
I tested locally with gcc 4.3, but gcc 4.2 behaves differently and fails.
Review URL: http://codereview.chromium.org/14165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/gfx')
| -rw-r--r-- | chrome/common/gfx/favicon_size.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/common/gfx/favicon_size.h b/chrome/common/gfx/favicon_size.h index 0b3b264..bc5c12a 100644 --- a/chrome/common/gfx/favicon_size.h +++ b/chrome/common/gfx/favicon_size.h @@ -5,15 +5,9 @@ #ifndef CHROME_COMMON_GFX_FAVICON_SIZE_H__ #define CHROME_COMMON_GFX_FAVICON_SIZE_H__ -#include "build/build_config.h" - // Size (along each axis) of the favicon. const int kFavIconSize = 16; -#if !defined(OS_LINUX) -// GCC 4.2 complains that this function is not used, and currently -// it's not used by any file compiled on Linux. GCC 4.3 does not complain. - // If the width or height is bigger than the favicon size, a new width/height // is calculated and returned in width/height that maintains the aspect // ratio of the supplied values. @@ -31,7 +25,5 @@ static void calc_favicon_target_size(int* width, int* height) { } } -#endif // !defined(OS_LINUX) - #endif // CHROME_COMMON_GFX_FAVICON_SIZE_H__ |