diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-10 18:59:16 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-10 19:26:05 +0300 |
| commit | 8034992e22d983bba46cfc06d4eec6f2aab71e28 (patch) | |
| tree | 1fc2c9b38737f6a36e4c183520f428efb5eff93e /tools | |
| parent | 9e2cf37c9062577f84406e08f31bd542ba41023f (diff) | |
Bin a local X11 wrapper header, vcl/inc/unx/salstd.hxx
We already have <tools/prex.h> and <tools/postx.h>, so make those be
sufficient instead. Bin another local vcl header vcl/inc/unx/svunx.h that just
included those prex.h and postx.h. Adapt includers accordingly.
Change-Id: I6638b3260fd3da45478fcc216b41f8c8a539f0d7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/postx.h | 3 | ||||
| -rw-r--r-- | tools/inc/tools/prex.h | 25 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tools/inc/tools/postx.h b/tools/inc/tools/postx.h index 493835b4e5df..7bce135d5a4f 100644 --- a/tools/inc/tools/postx.h +++ b/tools/inc/tools/postx.h @@ -24,7 +24,7 @@ } #endif -/* X-Types */ +/* X Types */ #undef Window #undef BYTE #undef INT8 @@ -45,7 +45,6 @@ #undef Success #undef Printer -/* #undef FontInfo */ #undef Orientation #undef GetToken diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h index d0a413c79d9f..e513880b0523 100644 --- a/tools/inc/tools/prex.h +++ b/tools/inc/tools/prex.h @@ -20,16 +20,20 @@ #ifndef _PREX_H #define _PREX_H -#define Window XLIB_Window -#define Font XLIB_Font +/* Types from <X11/X.h> that clash with LO's identifiers + * and we don't need. + */ +#define Boolean HIDE_XLIB_Boolean +#define Font HIDE_XLIB_Font +#define Icon HIDE_XLIB_Icon +#define String HIDE_XLIB_String + +/* Types from <X11/X.h> that clash, but we do use. */ #define Cursor XLIB_Cursor -#define String XLIB_String #define KeyCode XLIB_KeyCode #define Region XLIB_Region -#define Icon XLIB_Icon #define Time XLIB_Time -#define Region XLIB_Region -#define Boolean XLIB_Boolean +#define Window XLIB_Window #if defined __cplusplus extern "C" { @@ -41,19 +45,16 @@ extern "C" { #include <X11/StringDefs.h> #include <X11/extensions/Xrender.h> #include <X11/XKBlib.h> + +/* From <X11/Intrinsic.h> */ typedef unsigned long Pixel; -#undef DestroyAll -#define DestroyAll XLIB_DestroyAll -#define XLIB_DestroyAll 0 #undef String -#define String XLIB_String +#define String XLIB_String #undef KeyCode #define KeyCode XLIB_KeyCode //undef in intrinsics -#define __Ol_OlXlibExt_h__ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |