From 708fc1c187986796861c4dcecba2861ce272dd57 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 23 Aug 2014 18:33:43 +0300 Subject: 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 --- extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'extensions') 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 -- cgit