Skip to content

Commit

Permalink
don't pretend to support dbus on windows in dbus_export.h
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mostynb@opera.com committed Aug 7, 2014
1 parent a5f2f7f commit 3dfc99c
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions dbus/dbus_export.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,18 @@
// 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")))
#else
#define CHROME_DBUS_EXPORT
#endif

#endif // defined(WIN32)

#else // !defined(COMPONENT_BUILD)

#define CHROME_DBUS_EXPORT
Expand Down

0 comments on commit 3dfc99c

Please sign in to comment.