Commit 10ef5289 authored by Evan Stade's avatar Evan Stade Committed by Commit Bot

Remove WIN32 references from various *_export.h files in Ash

Bug: none
Change-Id: I9c8fcaa966474a059c1b1f910c18488265a9b772
Reviewed-on: https://chromium-review.googlesource.com/c/1474984
Commit-Queue: James Cook <jamescook@chromium.org>
Auto-Submit: Evan Stade <estade@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632783}
parent 0aa88f59
...@@ -9,21 +9,12 @@ ...@@ -9,21 +9,12 @@
// module can be exported to consumers. // module can be exported to consumers.
#if defined(COMPONENT_BUILD) #if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(APP_LIST_IMPLEMENTATION)
#define APP_LIST_EXPORT __declspec(dllexport)
#else
#define APP_LIST_EXPORT __declspec(dllimport)
#endif // defined(APP_LIST_IMPLEMENTATION)
#else // defined(WIN32)
#if defined(APP_LIST_IMPLEMENTATION) #if defined(APP_LIST_IMPLEMENTATION)
#define APP_LIST_EXPORT __attribute__((visibility("default"))) #define APP_LIST_EXPORT __attribute__((visibility("default")))
#else #else
#define APP_LIST_EXPORT #define APP_LIST_EXPORT
#endif #endif
#endif
#else // defined(COMPONENT_BUILD) #else // defined(COMPONENT_BUILD)
#define APP_LIST_EXPORT #define APP_LIST_EXPORT
......
...@@ -9,21 +9,12 @@ ...@@ -9,21 +9,12 @@
// app_list_model module can be exported to consumers. // app_list_model module can be exported to consumers.
#if defined(COMPONENT_BUILD) #if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(APP_LIST_MODEL_IMPLEMENTATION)
#define APP_LIST_MODEL_EXPORT __declspec(dllexport)
#else
#define APP_LIST_MODEL_EXPORT __declspec(dllimport)
#endif // defined(APP_LIST_MODEL_IMPLEMENTATION)
#else // defined(WIN32)
#if defined(APP_LIST_MODEL_IMPLEMENTATION) #if defined(APP_LIST_MODEL_IMPLEMENTATION)
#define APP_LIST_MODEL_EXPORT __attribute__((visibility("default"))) #define APP_LIST_MODEL_EXPORT __attribute__((visibility("default")))
#else #else
#define APP_LIST_MODEL_EXPORT #define APP_LIST_MODEL_EXPORT
#endif #endif
#endif
#else // defined(COMPONENT_BUILD) #else // defined(COMPONENT_BUILD)
#define APP_LIST_MODEL_EXPORT #define APP_LIST_MODEL_EXPORT
......
...@@ -9,21 +9,12 @@ ...@@ -9,21 +9,12 @@
// app_list presenter module can be exported to consumers. // app_list presenter module can be exported to consumers.
#if defined(COMPONENT_BUILD) #if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(APP_LIST_PRESENTER_IMPLEMENTATION)
#define APP_LIST_PRESENTER_EXPORT __declspec(dllexport)
#else
#define APP_LIST_PRESENTER_EXPORT __declspec(dllimport)
#endif // defined(APP_LIST_PRESENTER_IMPLEMENTATION)
#else // defined(WIN32)
#if defined(APP_LIST_PRESENTER_IMPLEMENTATION) #if defined(APP_LIST_PRESENTER_IMPLEMENTATION)
#define APP_LIST_PRESENTER_EXPORT __attribute__((visibility("default"))) #define APP_LIST_PRESENTER_EXPORT __attribute__((visibility("default")))
#else #else
#define APP_LIST_PRESENTER_EXPORT #define APP_LIST_PRESENTER_EXPORT
#endif #endif
#endif
#else // defined(COMPONENT_BUILD) #else // defined(COMPONENT_BUILD)
#define APP_LIST_PRESENTER_EXPORT #define APP_LIST_PRESENTER_EXPORT
......
...@@ -9,21 +9,12 @@ ...@@ -9,21 +9,12 @@
// module can be exported to consumers. // module can be exported to consumers.
#if defined(COMPONENT_BUILD) #if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(APP_MENU_IMPLEMENTATION)
#define APP_MENU_EXPORT __declspec(dllexport)
#else
#define APP_MENU_EXPORT __declspec(dllimport)
#endif // defined(APP_MENU_IMPLEMENTATION)
#else // defined(WIN32)
#if defined(APP_MENU_IMPLEMENTATION) #if defined(APP_MENU_IMPLEMENTATION)
#define APP_MENU_EXPORT __attribute__((visibility("default"))) #define APP_MENU_EXPORT __attribute__((visibility("default")))
#else #else
#define APP_MENU_EXPORT #define APP_MENU_EXPORT
#endif #endif
#endif
#else // defined(COMPONENT_BUILD) #else // defined(COMPONENT_BUILD)
#define APP_MENU_EXPORT #define APP_MENU_EXPORT
......
...@@ -9,21 +9,12 @@ ...@@ -9,21 +9,12 @@
// be exported to consumers. // be exported to consumers.
#if defined(COMPONENT_BUILD) #if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(ASH_IMPLEMENTATION)
#define ASH_EXPORT __declspec(dllexport)
#else
#define ASH_EXPORT __declspec(dllimport)
#endif // defined(ASH_IMPLEMENTATION)
#else // defined(WIN32)
#if defined(ASH_IMPLEMENTATION) #if defined(ASH_IMPLEMENTATION)
#define ASH_EXPORT __attribute__((visibility("default"))) #define ASH_EXPORT __attribute__((visibility("default")))
#else #else
#define ASH_EXPORT #define ASH_EXPORT
#endif #endif
#endif
#else // defined(COMPONENT_BUILD) #else // defined(COMPONENT_BUILD)
#define ASH_EXPORT #define ASH_EXPORT
......
...@@ -9,21 +9,12 @@ ...@@ -9,21 +9,12 @@
// the keyboard shortcut viewer module can be exported to consumers. // the keyboard shortcut viewer module can be exported to consumers.
#if defined(COMPONENT_BUILD) #if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(KSV_IMPLEMENTATION)
#define KSV_EXPORT __declspec(dllexport)
#else
#define KSV_EXPORT __declspec(dllimport)
#endif // defined(KSV_IMPLEMENTATION)
#else // defined(WIN32)
#if defined(KSV_IMPLEMENTATION) #if defined(KSV_IMPLEMENTATION)
#define KSV_EXPORT __attribute__((visibility("default"))) #define KSV_EXPORT __attribute__((visibility("default")))
#else #else
#define KSV_EXPORT #define KSV_EXPORT
#endif #endif
#endif
#else // defined(COMPONENT_BUILD) #else // defined(COMPONENT_BUILD)
#define KSV_EXPORT #define KSV_EXPORT
......
...@@ -7,24 +7,12 @@ ...@@ -7,24 +7,12 @@
#if defined(COMPONENT_BUILD) #if defined(COMPONENT_BUILD)
#if defined(WIN32)
#if defined(ASH_PUBLIC_IMPLEMENTATION)
#define ASH_PUBLIC_EXPORT __declspec(dllexport)
#else
#define ASH_PUBLIC_EXPORT __declspec(dllimport)
#endif
#else // !defined(WIN32)
#if defined(ASH_PUBLIC_IMPLEMENTATION) #if defined(ASH_PUBLIC_IMPLEMENTATION)
#define ASH_PUBLIC_EXPORT __attribute((visibility("default"))) #define ASH_PUBLIC_EXPORT __attribute((visibility("default")))
#else #else
#define ASH_PUBLIC_EXPORT #define ASH_PUBLIC_EXPORT
#endif #endif
#endif // defined(WIN32)
#else // !defined(COMPONENT_BUILD) #else // !defined(COMPONENT_BUILD)
#define ASH_PUBLIC_EXPORT #define ASH_PUBLIC_EXPORT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment