| Index: sky/engine/public/platform/WebCommon.h
|
| diff --git a/sky/engine/public/platform/WebCommon.h b/sky/engine/public/platform/WebCommon.h
|
| index 9967267124fbc07fcac56c3c567b1ecb35c06b84..501f1d6cb77489cc165785c1cb3f87d018ddb2c0 100644
|
| --- a/sky/engine/public/platform/WebCommon.h
|
| +++ b/sky/engine/public/platform/WebCommon.h
|
| @@ -44,27 +44,9 @@
|
| #endif
|
|
|
| #if defined(COMPONENT_BUILD)
|
| - #if defined(WIN32)
|
| - #if BLINK_IMPLEMENTATION
|
| - #define BLINK_EXPORT __declspec(dllexport)
|
| - #else // BLINK_IMPLEMENTATION
|
| - #define BLINK_EXPORT __declspec(dllimport)
|
| - #endif
|
| - #if BLINK_PLATFORM_IMPLEMENTATION
|
| - #define BLINK_PLATFORM_EXPORT __declspec(dllexport)
|
| - #else // BLINK_PLATFORM_IMPLEMENTATION
|
| - #define BLINK_PLATFORM_EXPORT __declspec(dllimport)
|
| - #endif
|
| - #if BLINK_COMMON_IMPLEMENTATION
|
| - #define BLINK_COMMON_EXPORT __declspec(dllexport)
|
| - #else // BLINK_COMMON_IMPLEMENTATION
|
| - #define BLINK_COMMON_EXPORT __declspec(dllimport)
|
| - #endif
|
| - #else // defined(WIN32)
|
| - #define BLINK_EXPORT __attribute__((visibility("default")))
|
| - #define BLINK_PLATFORM_EXPORT __attribute__((visibility("default")))
|
| - #define BLINK_COMMON_EXPORT __attribute__((visibility("default")))
|
| - #endif
|
| + #define BLINK_EXPORT __attribute__((visibility("default")))
|
| + #define BLINK_PLATFORM_EXPORT __attribute__((visibility("default")))
|
| + #define BLINK_COMMON_EXPORT __attribute__((visibility("default")))
|
| #else // defined(COMPONENT_BUILD)
|
| #define BLINK_EXPORT
|
| #define BLINK_PLATFORM_EXPORT
|
| @@ -76,17 +58,7 @@
|
| // Basic types
|
|
|
| #include <stddef.h> // For size_t
|
| -
|
| -#if defined(WIN32)
|
| -// Visual Studio doesn't have stdint.h.
|
| -typedef short int16_t;
|
| -typedef unsigned short uint16_t;
|
| -typedef int int32_t;
|
| -typedef unsigned int uint32_t;
|
| -typedef unsigned __int64 uint64_t;
|
| -#else
|
| #include <stdint.h> // For int32_t
|
| -#endif
|
|
|
| namespace blink {
|
|
|
| @@ -94,11 +66,7 @@ namespace blink {
|
| typedef int32_t WebUChar32;
|
|
|
| // UTF-16 character type
|
| -#if defined(WIN32)
|
| -typedef wchar_t WebUChar;
|
| -#else
|
| typedef unsigned short WebUChar;
|
| -#endif
|
|
|
| // Latin-1 character type
|
| typedef unsigned char WebLChar;
|
|
|