| Index: webkit/browser/storage_browser_export.h
|
| diff --git a/webkit/browser/storage_browser_export.h b/webkit/browser/storage_browser_export.h
|
| index 293ce4024c66d74ac819552a0f761703c53ed7f8..421ae558eb71169aceb821f1c70b653775c85b01 100644
|
| --- a/webkit/browser/storage_browser_export.h
|
| +++ b/webkit/browser/storage_browser_export.h
|
| @@ -1,34 +1,5 @@
|
| -// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 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 WEBKIT_BROWSER_STORAGE_BROWSER_EXPORT_H__
|
| -#define WEBKIT_BROWSER_STORAGE_BROWSER_EXPORT_H__
|
| -
|
| -#if defined(COMPONENT_BUILD)
|
| -#if defined(WIN32)
|
| -
|
| -#if defined(STORAGE_BROWSER_IMPLEMENTATION)
|
| -#define STORAGE_EXPORT __declspec(dllexport)
|
| -#define STORAGE_EXPORT_PRIVATE __declspec(dllexport)
|
| -#else
|
| -#define STORAGE_EXPORT __declspec(dllimport)
|
| -#define STORAGE_EXPORT_PRIVATE __declspec(dllimport)
|
| -#endif // defined(STORAGE_BROWSER_IMPLEMENTATION)
|
| -
|
| -#else // defined(WIN32)
|
| -#if defined(STORAGE_BROWSER_IMPLEMENTATION)
|
| -#define STORAGE_EXPORT __attribute__((visibility("default")))
|
| -#define STORAGE_EXPORT_PRIVATE __attribute__((visibility("default")))
|
| -#else
|
| -#define STORAGE_EXPORT
|
| -#define STORAGE_EXPORT_PRIVATE
|
| -#endif
|
| -#endif
|
| -
|
| -#else // defined(COMPONENT_BUILD)
|
| -#define STORAGE_EXPORT
|
| -#define STORAGE_EXPORT_PRIVATE
|
| -#endif
|
| -
|
| -#endif // WEBKIT_BROWSER_STORAGE_BROWSER_EXPORT_H__
|
| +#include "storage/browser/storage_browser_export.h"
|
|
|