Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: dbus/dbus_export.h

Issue 429043003: don't pretend to support dbus on windows in dbus_export.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef DBUS_DBUS_EXPORT_H_ 5 #ifndef DBUS_DBUS_EXPORT_H_
6 #define DBUS_DBUS_EXPORT_H_ 6 #define DBUS_DBUS_EXPORT_H_
7 7
8 // Defines CHROME_DBUS_EXPORT so that functionality implemented by the dbus 8 // Defines CHROME_DBUS_EXPORT so that functionality implemented by the dbus
9 // library can be exported to consumers. 9 // library can be exported to consumers.
10 // NOTE: We haven't used DBUS_EXPORT because it would conflict with the version 10 // NOTE: We haven't used DBUS_EXPORT because it would conflict with the version
11 // from /usr/include/dbus-1.0/dbus/dbus-macros.h. 11 // from /usr/include/dbus-1.0/dbus/dbus-macros.h.
12 12
13 #if defined(WIN32)
14 #error dbus support is not currently expected to work on windows
15 #endif // defined(WIN32)
16
13 #if defined(COMPONENT_BUILD) 17 #if defined(COMPONENT_BUILD)
14 #if defined(WIN32)
15
16 #if defined(DBUS_IMPLEMENTATION)
17 #define CHROME_DBUS_EXPORT __declspec(dllexport)
18 #else
19 #define CHROME_DBUS_EXPORT __declspec(dllimport)
20 #endif // defined(DBUS_IMPLEMENTATION)
21
22 #else // !defined(WIN32)
23 18
24 #if defined(DBUS_IMPLEMENTATION) 19 #if defined(DBUS_IMPLEMENTATION)
25 #define CHROME_DBUS_EXPORT __attribute__((visibility("default"))) 20 #define CHROME_DBUS_EXPORT __attribute__((visibility("default")))
26 #else 21 #else
27 #define CHROME_DBUS_EXPORT 22 #define CHROME_DBUS_EXPORT
28 #endif 23 #endif
29 24
30 #endif // defined(WIN32)
31
32 #else // !defined(COMPONENT_BUILD) 25 #else // !defined(COMPONENT_BUILD)
33 26
34 #define CHROME_DBUS_EXPORT 27 #define CHROME_DBUS_EXPORT
35 28
36 #endif // defined(COMPONENT_BUILD) 29 #endif // defined(COMPONENT_BUILD)
37 30
38 #endif // DBUS_DBUS_EXPORT_H_ 31 #endif // DBUS_DBUS_EXPORT_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698