diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 20:26:08 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-16 20:26:08 +0000 |
| commit | 43cf3ba4e6a3bc9a2ed2bc3a5f2e306fcd61f433 (patch) | |
| tree | 411f509e4097b2d3f712632a27b5792d202d2958 | |
| parent | 0cce3c58a78da9d7f142afaab14fb73055d88a1d (diff) | |
| download | chromium_src-43cf3ba4e6a3bc9a2ed2bc3a5f2e306fcd61f433.zip chromium_src-43cf3ba4e6a3bc9a2ed2bc3a5f2e306fcd61f433.tar.gz chromium_src-43cf3ba4e6a3bc9a2ed2bc3a5f2e306fcd61f433.tar.bz2 | |
Fix Linux build failure caused by GCC 4.3/4.2 differences.
Review URL: http://codereview.chromium.org/14481
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7083 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/gfx/favicon_size.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/gfx/favicon_size.h b/chrome/common/gfx/favicon_size.h index bc5c12a..0b3b264 100644 --- a/chrome/common/gfx/favicon_size.h +++ b/chrome/common/gfx/favicon_size.h @@ -5,9 +5,15 @@ #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. @@ -25,5 +31,7 @@ static void calc_favicon_target_size(int* width, int* height) { } } +#endif // !defined(OS_LINUX) + #endif // CHROME_COMMON_GFX_FAVICON_SIZE_H__ |