diff options
| author | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 11:45:59 +0000 |
|---|---|---|
| committer | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 11:45:59 +0000 |
| commit | 3dfc99cceb469463d79d82123337121baeb4f05a (patch) | |
| tree | 25da2407fd4aab24e96c2e21ed780c6c689c7876 /dbus | |
| parent | a5f2f7f3d2e107cca48298b32521672b261f5dd4 (diff) | |
| download | chromium_src-3dfc99cceb469463d79d82123337121baeb4f05a.zip chromium_src-3dfc99cceb469463d79d82123337121baeb4f05a.tar.gz chromium_src-3dfc99cceb469463d79d82123337121baeb4f05a.tar.bz2 | |
don't pretend to support dbus on windows in dbus_export.h
Since dbus is only used on linux, don't bother with windows specific symbol exporting.
BUG=398644
Review URL: https://codereview.chromium.org/429043003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus_export.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/dbus/dbus_export.h b/dbus/dbus_export.h index 0eda41a..7c96d17 100644 --- a/dbus/dbus_export.h +++ b/dbus/dbus_export.h @@ -10,16 +10,11 @@ // NOTE: We haven't used DBUS_EXPORT because it would conflict with the version // from /usr/include/dbus-1.0/dbus/dbus-macros.h. -#if defined(COMPONENT_BUILD) #if defined(WIN32) +#error dbus support is not currently expected to work on windows +#endif // defined(WIN32) -#if defined(DBUS_IMPLEMENTATION) -#define CHROME_DBUS_EXPORT __declspec(dllexport) -#else -#define CHROME_DBUS_EXPORT __declspec(dllimport) -#endif // defined(DBUS_IMPLEMENTATION) - -#else // !defined(WIN32) +#if defined(COMPONENT_BUILD) #if defined(DBUS_IMPLEMENTATION) #define CHROME_DBUS_EXPORT __attribute__((visibility("default"))) @@ -27,8 +22,6 @@ #define CHROME_DBUS_EXPORT #endif -#endif // defined(WIN32) - #else // !defined(COMPONENT_BUILD) #define CHROME_DBUS_EXPORT |