diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 18:35:10 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 18:35:10 +0000 |
| commit | 8120ab190f48accf55af503b9eda73b52fc4a8e7 (patch) | |
| tree | 259a3dade283a42700bad50712e5619553a5353b /content/browser/speech/google_streaming_remote_engine.cc | |
| parent | d3f3189f1cd8607b376827e21355d86715ab1aac (diff) | |
| download | chromium_src-8120ab190f48accf55af503b9eda73b52fc4a8e7.zip chromium_src-8120ab190f48accf55af503b9eda73b52fc4a8e7.tar.gz chromium_src-8120ab190f48accf55af503b9eda73b52fc4a8e7.tar.bz2 | |
Revert 262147 "Remove all uses of GG_LONGLONG and GG_ULONGLONG."
> Remove all uses of GG_LONGLONG and GG_ULONGLONG.
>
> 123LL and 123ULL now work everywhere. You can also use INT64_C and
> UINT64_C (from <stdint.h>) in Chromium code (we force-define
> __STDC_CONSTANT_MACROS). (And sometimes you can just use
> static_cast<(u)int64_t>.)
>
> Don't remove their definitions yet, because some macros that are
> multiply-defined (in an identical way) rely on them. D'oh.
>
> R=brettw@chromium.org
> TBR=sky@chromium.org,satorux@chromium.org,vrk@chromium.org,rch@chromium.org,shess@chromium.org
>
> Review URL: https://codereview.chromium.org/218953003
TBR=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/227743006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech/google_streaming_remote_engine.cc')
| -rw-r--r-- | content/browser/speech/google_streaming_remote_engine.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/speech/google_streaming_remote_engine.cc b/content/browser/speech/google_streaming_remote_engine.cc index 6b78f23..88a461a 100644 --- a/content/browser/speech/google_streaming_remote_engine.cc +++ b/content/browser/speech/google_streaming_remote_engine.cc @@ -563,8 +563,8 @@ std::string GoogleStreamingRemoteEngine::GetAcceptedLanguages() const { // TODO(primiano): Is there any utility in the codebase that already does this? std::string GoogleStreamingRemoteEngine::GenerateRequestKey() const { - const int64 kKeepLowBytes = 0x00000000FFFFFFFFLL; - const int64 kKeepHighBytes = 0xFFFFFFFF00000000LL; + const int64 kKeepLowBytes = GG_LONGLONG(0x00000000FFFFFFFF); + const int64 kKeepHighBytes = GG_LONGLONG(0xFFFFFFFF00000000); // Just keep the least significant bits of timestamp, in order to reduce // probability of collisions. |