diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-23 18:33:43 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-23 19:20:03 +0300 |
| commit | 708fc1c187986796861c4dcecba2861ce272dd57 (patch) | |
| tree | eddd1b2260db90b6727e69b977a4f48922b6b6b2 /extensions | |
| parent | f74a6338b3897df49f3041e7ce33453eaba9e2e5 (diff) | |
fdo#82577, fdo#82579: Handle Cursor
Put the vcl Cursor in the vcl namespace. Avoids collision with the Xlib Cursor
typedef and some ancient Carbon (?) Cursor typedef on OS X.
Change-Id: I7af770c522b5774c87f58cc079ced9fc1bcc88b0
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 0d8f787be5e5..4b0a5e6671a6 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -43,7 +43,6 @@ #define Font XLIB_Font #define KeyCode XLIB_KeyCode #define Time XLIB_Time -#define Cursor XLIB_Cursor #define Region XLIB_Region #define String XLIB_String #define Boolean XLIB_Boolean @@ -106,7 +105,6 @@ extern "C" { #undef Font #undef KeyCode #undef Time -#undef Cursor #undef String #undef Region #undef Boolean |