diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 14:03:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 14:03:32 +0000 |
| commit | 02dae3f63f25349271b42a22f2b284e9c7b06c31 (patch) | |
| tree | 10cd7338b24f6a6ca95e1d277b84db24847ec86c /xorg-server/miext/rootless/rootlessWindow.c | |
| parent | c22392bbc22abe864cdcef8c5e197d10faad5d03 (diff) | |
| download | vcxsrv-02dae3f63f25349271b42a22f2b284e9c7b06c31.tar.gz vcxsrv-02dae3f63f25349271b42a22f2b284e9c7b06c31.tar.bz2 vcxsrv-02dae3f63f25349271b42a22f2b284e9c7b06c31.zip | |
Resynchronised with released branch (miext rootless is not used.)
Diffstat (limited to 'xorg-server/miext/rootless/rootlessWindow.c')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index f3bbd21cf..e273d0e38 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -36,13 +36,13 @@ #include <stddef.h> /* For NULL */ #include <limits.h> /* For CHAR_BIT */ #include <assert.h> -#include <X11/Xatom.h> -#include <Xplugin.h> #ifdef __APPLE__ //#include <X11/Xlib.h> +#include <X11/Xatom.h> #include "mi.h" #include "pixmapstr.h" #include "windowstr.h" +#include <Xplugin.h> //#include <X11/extensions/applewm.h> extern int darwinMainScreenX, darwinMainScreenY; #endif @@ -86,11 +86,9 @@ static inline int configure_window (xp_window_id id, unsigned int mask, const xp_window_changes *values) { -#ifdef __APPLE__ if (!no_configure_window) return xp_configure_window (id, mask, values); else -#endif return XP_Success; } @@ -105,7 +103,6 @@ current_time_in_seconds (void) return t; } */ -#ifdef __APPLE__ void RootlessNativeWindowStateChanged (WindowPtr pWin, unsigned int state) { @@ -175,7 +172,6 @@ set_screen_origin (WindowPtr pWin) dixChangeWindowProperty(serverClient, pWin, xa_native_screen_origin(), XA_INTEGER, 32, PropModeReplace, 2, data, TRUE); } -#endif /* __APPLE__ */ /* * RootlessCreateWindow |