diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-23 09:29:35 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-23 09:29:56 +0200 |
| commit | 15c609f33da44c24e1d0cf19670b0da43738ce0c (patch) | |
| tree | a3c9fc4042ec02199491bda40ea89442d6539538 | |
| parent | e29862bcc509916e7fe3e9b2f43b0672c49b7f6e (diff) | |
Use prex.h/postx.h
Change-Id: I055ae0426df86a1ea49385bc8c0b176cc4b9d940
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 17 | ||||
| -rw-r--r-- | extensions/source/plugin/unx/npwrap.cxx | 2 |
2 files changed, 4 insertions, 15 deletions
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 14ed54750ff9..b505bda006d2 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -39,13 +39,8 @@ # define USE_MOTIF #endif -#define Window XLIB_Window -#define Font XLIB_Font -#define Time XLIB_Time -#define Region XLIB_Region -#define String XLIB_String -#define Boolean XLIB_Boolean -#define XPointer XLIB_XPointer +#include <prex.h> + #include <X11/Xlib.h> extern "C" { #include <X11/Intrinsic.h> @@ -100,13 +95,7 @@ extern "C" { #define GtkWidget void #endif -#undef Window -#undef Font -#undef Time -#undef String -#undef Region -#undef Boolean -#undef XPointer +#include <postx.h> class ConnectorInstance { diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index 196d913ba3c7..d5d5fdcf32c4 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.cxx @@ -154,7 +154,7 @@ Widget createSubWidget( char* /*pPluginText*/, Widget shell, XLIB_Window aParent void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow ) { - XLIB_String n, c; + String n, c; XtGetApplicationNameAndClass(pXtAppDisplay, &n, &c); Widget newShell = |