diff options
| author | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 14:19:03 +0000 |
|---|---|---|
| committer | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 14:19:03 +0000 |
| commit | 9e0cdb821b66e00389142e175dfbc15ab9535d42 (patch) | |
| tree | 9fec212b174a43287f28c9c0c9c5800725ee81b9 | |
| parent | c3b3d9590cbef573fafbffe7e33a43af28036812 (diff) | |
| download | chromium_src-9e0cdb821b66e00389142e175dfbc15ab9535d42.zip chromium_src-9e0cdb821b66e00389142e175dfbc15ab9535d42.tar.gz chromium_src-9e0cdb821b66e00389142e175dfbc15ab9535d42.tar.bz2 | |
Fix duplicate OFFICIAL_BUILD macros.
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/9212049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119893 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/chrome_version_info.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_version_info_posix.h.version | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/chrome_version_info.cc b/chrome/common/chrome_version_info.cc index 53ac92a..20124bc 100644 --- a/chrome/common/chrome_version_info.cc +++ b/chrome/common/chrome_version_info.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -86,7 +86,7 @@ std::string VersionInfo::LastChange() const { } bool VersionInfo::IsOfficialBuild() const { - return OFFICIAL_BUILD; + return IS_OFFICIAL_BUILD; } #endif diff --git a/chrome/common/chrome_version_info_posix.h.version b/chrome/common/chrome_version_info_posix.h.version index 670dc8c..7ce9982 100644 --- a/chrome/common/chrome_version_info_posix.h.version +++ b/chrome/common/chrome_version_info_posix.h.version @@ -8,6 +8,6 @@ #define PRODUCT_NAME "@PRODUCT_FULLNAME@" #define PRODUCT_VERSION "@MAJOR@.@MINOR@.@BUILD@.@PATCH@" #define LAST_CHANGE "@LASTCHANGE@" -#define OFFICIAL_BUILD @OFFICIAL_BUILD@ +#define IS_OFFICIAL_BUILD @OFFICIAL_BUILD@ #endif // CHROME_COMMON_CHROME_VERSION_INFO_POSIX_H_ |