Chromium Code Reviews| Index: sandbox/sandbox_export.h |
| diff --git a/sandbox/linux/sandbox_export.h b/sandbox/sandbox_export.h |
| similarity index 62% |
| rename from sandbox/linux/sandbox_export.h |
| rename to sandbox/sandbox_export.h |
| index 546de908edac9d59b7f3b185b7a2b3354eb712cc..0b773034ba4a3f46fa3749d1fcf79ae3b5b00169 100644 |
| --- a/sandbox/linux/sandbox_export.h |
| +++ b/sandbox/sandbox_export.h |
| @@ -2,10 +2,19 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef SANDBOX_LINUX_SANDBOX_EXPORT_H_ |
| -#define SANDBOX_LINUX_SANDBOX_EXPORT_H_ |
| +#ifndef SANDBOX_SANDBOX_EXPORT_H_ |
| +#define SANDBOX_SANDBOX_EXPORT_H_ |
| #if defined(COMPONENT_BUILD) |
| +#if defined(WIN32) |
|
rvargas (doing something else)
2014/05/12 21:56:35
I don't think we should have this part. At the ver
Robert Sesek
2014/05/12 22:09:48
It seemed wrong to move it to the parent directory
rvargas (doing something else)
2014/05/12 22:49:57
Now I'm confused. Are you saying that this file sh
Robert Sesek
2014/05/12 23:29:42
No, it's needed by Mac and Linux. It didn't seem s
|
| + |
| +#if defined(SANDBOX_IMPLEMENTATION) |
| +#define SANDBOX_EXPORT __declspec(dllexport) |
| +#else |
| +#define SANDBOX_EXPORT __declspec(dllimport) |
| +#endif // defined(GFX_IMPLEMENTATION) |
| + |
| +#else // defined(WIN32) |
| #if defined(SANDBOX_IMPLEMENTATION) |
| #define SANDBOX_EXPORT __attribute__((visibility("default"))) |
| @@ -15,9 +24,12 @@ |
| #define SANDBOX_EXPORT_PRIVATE |
| #endif // defined(SANDBOX_IMPLEMENTATION) |
| +#endif // defined(WIN32) |
| #else // defined(COMPONENT_BUILD) |
| + |
| #define SANDBOX_EXPORT |
| #define SANDBOX_EXPORT_PRIVATE |
| + |
| #endif // defined(COMPONENT_BUILD) |
| -#endif // SANDBOX_LINUX_SANDBOX_EXPORT_H_ |
| +#endif // SANDBOX_SANDBOX_EXPORT_H_ |