diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 22:09:24 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 22:09:24 +0000 |
| commit | b0ef7a630a6c5a1e769678e5d4c339a8217a6795 (patch) | |
| tree | e9ae7fd740b23878cc33572cb3d9eae6d69a9911 | |
| parent | 8a45312a31b186af8076913d2fb663008b73c618 (diff) | |
| download | chromium_src-b0ef7a630a6c5a1e769678e5d4c339a8217a6795.zip chromium_src-b0ef7a630a6c5a1e769678e5d4c339a8217a6795.tar.gz chromium_src-b0ef7a630a6c5a1e769678e5d4c339a8217a6795.tar.bz2 | |
Rolled cache invalidation library to @21 to fix windows warnings.
BUG=34647
TEST=compiled on windows, verified there were no warnings
Review URL: http://codereview.chromium.org/2854011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50285 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 1 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/overrides/google/cacheinvalidation/compiler-specific.h | 10 |
3 files changed, 12 insertions, 1 deletions
@@ -46,7 +46,7 @@ deps = { "http://protobuf.googlecode.com/svn/trunk@327", "src/third_party/cacheinvalidation/files": - "http://google-cache-invalidation-api.googlecode.com/svn/trunk@13", + "http://google-cache-invalidation-api.googlecode.com/svn/trunk@21", "src/tools/gyp": "http://gyp.googlecode.com/svn/trunk@826", diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index b0700f2..f429bda 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -86,6 +86,7 @@ 'type': '<(library)', 'sources': [ 'overrides/google/cacheinvalidation/callback.h', + 'overrides/google/cacheinvalidation/compiler-specific.h', 'overrides/google/cacheinvalidation/googletest.h', 'overrides/google/cacheinvalidation/logging.h', 'overrides/google/cacheinvalidation/mutex.h', diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/compiler-specific.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/compiler-specific.h new file mode 100644 index 0000000..5ca6b57 --- /dev/null +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/compiler-specific.h @@ -0,0 +1,10 @@ +// Copyright (c) 2010 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. + +#ifndef GOOGLE_CACHEINVALIDATION_COMPILER_SPECIFIC_H_ +#define GOOGLE_CACHEINVALIDATION_COMPILER_SPECIFIC_H_ + +#include "base/compiler_specific.h" + +#endif // GOOGLE_CACHEINVALIDATION_COMPILER_SPECIFIC_H_ |