From 3d511617f402456a86ced13027797872dba672de Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Tue, 25 Apr 2000 19:55:35 +0000 Subject: [PATCH] Removed X_DISPLAY_MISSING. --- graphics/x11drv/bitblt.c | 4 +--- graphics/x11drv/bitmap.c | 3 --- graphics/x11drv/brush.c | 5 ----- graphics/x11drv/clipping.c | 5 +---- graphics/x11drv/dib.c | 8 -------- graphics/x11drv/graphics.c | 4 +--- graphics/x11drv/init.c | 3 --- graphics/x11drv/objects.c | 4 +--- graphics/x11drv/oembitmap.c | 3 --- graphics/x11drv/palette.c | 3 --- graphics/x11drv/pen.c | 4 ---- graphics/x11drv/text.c | 7 +++---- graphics/x11drv/xfont.c | 10 +++------- include/ts_xf86dga.h | 4 ---- include/ts_xf86dga2.h | 4 ---- include/ts_xf86vmode.h | 4 ---- include/ts_xlib.h | 4 ---- include/ts_xpm.h | 4 ---- include/ts_xresource.h | 4 ---- include/ts_xshm.h | 4 ---- include/ts_xutil.h | 4 ---- include/x11drv.h | 6 +++--- tools/make_X11wrappers | 7 ------- tsx11/ts_xf86dga.c | 3 --- tsx11/ts_xf86dga2.c | 3 --- tsx11/ts_xf86vmode.c | 3 --- tsx11/ts_xlib.c | 3 --- tsx11/ts_xpm.c | 3 --- tsx11/ts_xresource.c | 3 --- tsx11/ts_xshm.c | 3 --- tsx11/ts_xutil.c | 3 --- windows/x11drv/clipboard.c | 9 +++------ windows/x11drv/event.c | 6 +----- windows/x11drv/init.c | 6 ------ windows/x11drv/keyboard.c | 11 ++++------- windows/x11drv/mouse.c | 5 ----- windows/x11drv/wnd.c | 6 +++--- 37 files changed, 24 insertions(+), 151 deletions(-) diff --git a/graphics/x11drv/bitblt.c b/graphics/x11drv/bitblt.c index a27ff0d56d7..396d363df23 100644 --- a/graphics/x11drv/bitblt.c +++ b/graphics/x11drv/bitblt.c @@ -6,9 +6,8 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include + #include "ts_xlib.h" #include @@ -1542,4 +1541,3 @@ BOOL X11DRV_StretchBlt( DC *dcDst, INT xDst, INT yDst, return result; } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c index 65468bbd9b7..67f3d081bed 100644 --- a/graphics/x11drv/bitmap.c +++ b/graphics/x11drv/bitmap.c @@ -7,8 +7,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "ts_xlib.h" #include "ts_xutil.h" @@ -618,4 +616,3 @@ Pixmap X11DRV_BITMAP_Pixmap(HBITMAP hbitmap) return (Pixmap)bmp->physBitmap; } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/graphics/x11drv/brush.c b/graphics/x11drv/brush.c index a48f5883922..d5a090acfcf 100644 --- a/graphics/x11drv/brush.c +++ b/graphics/x11drv/brush.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "ts_xlib.h" #include @@ -285,6 +283,3 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush ) return prevHandle; } - -#endif /* !defined(X_DISPLAY_MISSING) */ - diff --git a/graphics/x11drv/clipping.c b/graphics/x11drv/clipping.c index 1f3bc9d1d42..5905217116d 100644 --- a/graphics/x11drv/clipping.c +++ b/graphics/x11drv/clipping.c @@ -6,11 +6,10 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "ts_xlib.h" #include + #include "dc.h" #include "x11drv.h" #include "region.h" @@ -74,5 +73,3 @@ void X11DRV_SetDeviceClipping( DC * dc ) GDI_HEAP_UNLOCK( dc->w.hGCClipRgn ); } -#endif /* !defined(X_DISPLAY_MISSING) */ - diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c index 6f7a1093c9e..8017267adf4 100644 --- a/graphics/x11drv/dib.c +++ b/graphics/x11drv/dib.c @@ -6,11 +6,8 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "ts_xlib.h" #include "ts_xutil.h" - #ifdef HAVE_LIBXXSHM # include "ts_xshm.h" # ifdef HAVE_SYS_SHM_H @@ -3553,8 +3550,3 @@ Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ) TRACE("\tReturning Pixmap %ld\n", pixmap); return pixmap; } - -#endif /* !defined(X_DISPLAY_MISSING) */ - - - diff --git a/graphics/x11drv/graphics.c b/graphics/x11drv/graphics.c index 333275974dd..e470674e6fc 100644 --- a/graphics/x11drv/graphics.c +++ b/graphics/x11drv/graphics.c @@ -11,9 +11,8 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include + #include "ts_xlib.h" #include "ts_xutil.h" @@ -1352,4 +1351,3 @@ BOOL X11DRV_GetDCOrgEx( DC *dc, LPPOINT lpp ) return TRUE; } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/graphics/x11drv/init.c b/graphics/x11drv/init.c index 92ce48b2ab9..13b7b7454f7 100644 --- a/graphics/x11drv/init.c +++ b/graphics/x11drv/init.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "ts_xlib.h" #include @@ -312,4 +310,3 @@ static INT X11DRV_Escape( DC *dc, INT nEscape, INT cbInput, return 0; } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/graphics/x11drv/objects.c b/graphics/x11drv/objects.c index 497abe1a6b2..ec3576f9627 100644 --- a/graphics/x11drv/objects.c +++ b/graphics/x11drv/objects.c @@ -6,10 +6,9 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include #include + #include "bitmap.h" #include "brush.h" #include "font.h" @@ -88,4 +87,3 @@ BOOL X11DRV_DeleteObject( HGDIOBJ handle ) return ret; } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/graphics/x11drv/oembitmap.c b/graphics/x11drv/oembitmap.c index ab4c8cb5a3d..4d3872f993e 100644 --- a/graphics/x11drv/oembitmap.c +++ b/graphics/x11drv/oembitmap.c @@ -7,8 +7,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "ts_xlib.h" #include "ts_xutil.h" @@ -625,4 +623,3 @@ BOOL X11DRV_OBM_Init(void) return 1; } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/graphics/x11drv/palette.c b/graphics/x11drv/palette.c index 7bd0fccdbd6..0878334382c 100644 --- a/graphics/x11drv/palette.c +++ b/graphics/x11drv/palette.c @@ -7,8 +7,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "ts_xlib.h" #include @@ -992,4 +990,3 @@ BOOL X11DRV_PALETTE_IsDark(int pixel) return (GetRValue(col) + GetGValue(col) + GetBValue(col)) <= 0x180; } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/graphics/x11drv/pen.c b/graphics/x11drv/pen.c index 4e9d6ca31a8..33cbdd22dcd 100644 --- a/graphics/x11drv/pen.c +++ b/graphics/x11drv/pen.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "pen.h" #include "color.h" #include "x11drv.h" @@ -68,5 +66,3 @@ HPEN X11DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen ) return prevHandle; } - -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c index 7bea6632012..9e42f80690f 100644 --- a/graphics/x11drv/text.c +++ b/graphics/x11drv/text.c @@ -6,14 +6,14 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include + #include "ts_xlib.h" #include -#include "windef.h" #include + +#include "windef.h" #include "dc.h" #include "gdi.h" #include "heap.h" @@ -371,4 +371,3 @@ END: return TRUE; } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c index 3d60cef5037..db708da41e4 100644 --- a/graphics/x11drv/xfont.c +++ b/graphics/x11drv/xfont.c @@ -9,11 +9,9 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING #include + #include "ts_xlib.h" -#include "x11font.h" -#endif /* !defined(X_DISPLAY_MISSING) */ #include #include @@ -25,6 +23,7 @@ #include #include #include + #include "windef.h" #include "wingdi.h" #include "winuser.h" @@ -34,11 +33,10 @@ #include "debugtools.h" #include "ldt.h" #include "tweak.h" +#include "x11font.h" DEFAULT_DEBUG_CHANNEL(font) -#ifndef X_DISPLAY_MISSING - #define X_PFONT_MAGIC (0xFADE0000) #define X_FMC_MAGIC (0x0000CAFE) @@ -3073,5 +3071,3 @@ BOOL X11DRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar, } return FALSE; } - -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/include/ts_xf86dga.h b/include/ts_xf86dga.h index 8a48f54e257..39efc010114 100644 --- a/include/ts_xf86dga.h +++ b/include/ts_xf86dga.h @@ -11,8 +11,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #ifdef HAVE_LIBXXF86DGA #include @@ -30,6 +28,4 @@ extern Status TSXF86DGAViewPortChanged(Display*,int,int); #endif /* defined(HAVE_LIBXXF86DGA) */ -#endif /* !defined(X_DISPLAY_MISSING) */ - #endif /* __WINE_TS_XF86DGA_H */ diff --git a/include/ts_xf86dga2.h b/include/ts_xf86dga2.h index a901e8aa066..3c746873516 100644 --- a/include/ts_xf86dga2.h +++ b/include/ts_xf86dga2.h @@ -11,8 +11,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #ifdef HAVE_LIBXXF86DGA2 #include @@ -39,6 +37,4 @@ extern void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent*, XKeyEvent*); #endif /* defined(HAVE_LIBXXF86DGA2) */ -#endif /* !defined(X_DISPLAY_MISSING) */ - #endif /* __WINE_TS_XF86DGA2_H */ diff --git a/include/ts_xf86vmode.h b/include/ts_xf86vmode.h index 77911f5a5d0..65d72647c75 100644 --- a/include/ts_xf86vmode.h +++ b/include/ts_xf86vmode.h @@ -11,8 +11,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "windef.h" #ifdef HAVE_LIBXXF86VM #define XMD_H @@ -38,6 +36,4 @@ extern Bool TSXF86VidModeSetViewPort(Display*,int,int,int); #endif /* defined(HAVE_LIBXXF86VM) */ -#endif /* !defined(X_DISPLAY_MISSING) */ - #endif /* __WINE_TS_XF86VMODE_H */ diff --git a/include/ts_xlib.h b/include/ts_xlib.h index b3fb97cd78b..a5208307fde 100644 --- a/include/ts_xlib.h +++ b/include/ts_xlib.h @@ -11,8 +11,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include @@ -143,6 +141,4 @@ extern int (*TSXSynchronize(Display *, Bool))(Display *); extern void TS_XInitImageFuncPtrs(XImage *); -#endif /* !defined(X_DISPLAY_MISSING) */ - #endif /* __WINE_TS_XLIB_H */ diff --git a/include/ts_xpm.h b/include/ts_xpm.h index 2a1380bf374..a12eb679aee 100644 --- a/include/ts_xpm.h +++ b/include/ts_xpm.h @@ -11,8 +11,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #ifdef HAVE_LIBXXPM #include @@ -22,6 +20,4 @@ extern int TSXpmAttributesSize(void); #endif /* defined(HAVE_LIBXXPM) */ -#endif /* !defined(X_DISPLAY_MISSING) */ - #endif /* __WINE_TS_XPM_H */ diff --git a/include/ts_xresource.h b/include/ts_xresource.h index 394b9f55750..73953f210bf 100644 --- a/include/ts_xresource.h +++ b/include/ts_xresource.h @@ -11,8 +11,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include #include @@ -25,6 +23,4 @@ extern void TSXrmMergeDatabases(XrmDatabase, XrmDatabase*); extern void TSXrmParseCommand(XrmDatabase*, XrmOptionDescList, int, const char*, int*, char**); -#endif /* !defined(X_DISPLAY_MISSING) */ - #endif /* __WINE_TS_XRESOURCE_H */ diff --git a/include/ts_xshm.h b/include/ts_xshm.h index 9058d86b19c..f1b02191a04 100644 --- a/include/ts_xshm.h +++ b/include/ts_xshm.h @@ -11,8 +11,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #ifdef HAVE_LIBXXSHM #include @@ -30,6 +28,4 @@ extern Pixmap TSXShmCreatePixmap(Display *, Drawable, char *, XShmSegmentInfo *, #endif /* defined(HAVE_LIBXXSHM) */ -#endif /* !defined(X_DISPLAY_MISSING) */ - #endif /* __WINE_TS_XSHM_H */ diff --git a/include/ts_xutil.h b/include/ts_xutil.h index af3434ab483..007b2b2554f 100644 --- a/include/ts_xutil.h +++ b/include/ts_xutil.h @@ -11,8 +11,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include #include @@ -54,6 +52,4 @@ extern int TSXAddPixel(struct _XImage *, long); extern XContext TSXUniqueContext(void); -#endif /* !defined(X_DISPLAY_MISSING) */ - #endif /* __WINE_TS_XUTIL_H */ diff --git a/include/x11drv.h b/include/x11drv.h index f3c3793e700..26e48a6923a 100644 --- a/include/x11drv.h +++ b/include/x11drv.h @@ -7,18 +7,18 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING #include #include #include #include -#endif /* !defined(X_DISPLAY_MISSING) */ +#ifdef HAVE_LIBXXSHM +# include +#endif /* defined(HAVE_LIBXXSHM) */ #include "gdi.h" #include "winbase.h" #include "windef.h" -#include struct tagBITMAPOBJ; struct tagCLASS; diff --git a/tools/make_X11wrappers b/tools/make_X11wrappers index 61b5c23f269..c443ff3dd8b 100755 --- a/tools/make_X11wrappers +++ b/tools/make_X11wrappers @@ -95,8 +95,6 @@ foreach $name (@dolist) { #include "config.h" -#ifndef X_DISPLAY_MISSING - $pre_file $x11_incl#include @@ -111,8 +109,6 @@ END #include "config.h" -#ifndef X_DISPLAY_MISSING - $pre_file $x11_incl#include @@ -375,14 +371,11 @@ END print OUTH < @@ -120,4 +118,3 @@ Status TSXF86DGAViewPortChanged(Display*a0,int a1,int a2) #endif /* defined(HAVE_LIBXXF86DGA) */ -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/tsx11/ts_xf86dga2.c b/tsx11/ts_xf86dga2.c index 50c007fe969..d8e16e0bde8 100644 --- a/tsx11/ts_xf86dga2.c +++ b/tsx11/ts_xf86dga2.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #ifdef HAVE_LIBXXF86DGA2 #include @@ -199,4 +197,3 @@ void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent* a0, XKeyEvent* a1) #endif /* defined(HAVE_LIBXXF86DGA2) */ -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/tsx11/ts_xf86vmode.c b/tsx11/ts_xf86vmode.c index 035404aee7e..090095acb07 100644 --- a/tsx11/ts_xf86vmode.c +++ b/tsx11/ts_xf86vmode.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "windef.h" #ifdef HAVE_LIBXXF86VM #define XMD_H @@ -178,4 +176,3 @@ Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3) #endif /* defined(HAVE_LIBXXF86VM) */ -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/tsx11/ts_xlib.c b/tsx11/ts_xlib.c index 44e238bc631..c54e3668c9c 100644 --- a/tsx11/ts_xlib.c +++ b/tsx11/ts_xlib.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include @@ -1391,4 +1389,3 @@ void TS_XInitImageFuncPtrs(XImage *a0) } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/tsx11/ts_xpm.c b/tsx11/ts_xpm.c index 115a8060626..648f3557e24 100644 --- a/tsx11/ts_xpm.c +++ b/tsx11/ts_xpm.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #ifdef HAVE_LIBXXPM #include @@ -42,4 +40,3 @@ int TSXpmAttributesSize(void) #endif /* defined(HAVE_LIBXXPM) */ -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/tsx11/ts_xresource.c b/tsx11/ts_xresource.c index c5bbfa547dd..ef45063bfea 100644 --- a/tsx11/ts_xresource.c +++ b/tsx11/ts_xresource.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include #include @@ -81,4 +79,3 @@ void TSXrmParseCommand(XrmDatabase* a0, XrmOptionDescList a1, int a2, const ch } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/tsx11/ts_xshm.c b/tsx11/ts_xshm.c index c42f37723b2..87ad78d5f3c 100644 --- a/tsx11/ts_xshm.c +++ b/tsx11/ts_xshm.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #ifdef HAVE_LIBXXSHM #include @@ -120,4 +118,3 @@ Pixmap TSXShmCreatePixmap(Display *a0, Drawable a1, char *a2, XShmSegmentInfo *a #endif /* defined(HAVE_LIBXXSHM) */ -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/tsx11/ts_xutil.c b/tsx11/ts_xutil.c index 3e7bdc19c63..638a6149c08 100644 --- a/tsx11/ts_xutil.c +++ b/tsx11/ts_xutil.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include #include @@ -390,4 +388,3 @@ XContext TSXUniqueContext(void) } -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c index f9cf96e20d6..52ce5dc5e2c 100644 --- a/windows/x11drv/clipboard.c +++ b/windows/x11drv/clipboard.c @@ -47,17 +47,16 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING +#include + +#include "ts_xlib.h" #include -#include #include #include #include #include -#include "ts_xlib.h" - #include "windef.h" #include "wingdi.h" #include "wine/winuser16.h" @@ -1239,5 +1238,3 @@ void X11DRV_CLIPBOARD_FreeResources( Atom property ) else prop = &(*prop)->next; } } - -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c index 3e63b9eae12..bcb8fd246ee 100644 --- a/windows/x11drv/event.c +++ b/windows/x11drv/event.c @@ -7,17 +7,15 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include #include + #include "ts_xlib.h" #include "ts_xresource.h" #include "ts_xutil.h" #ifdef HAVE_LIBXXSHM #include "ts_xshm.h" #endif - #ifdef HAVE_LIBXXF86DGA2 #include "ts_xf86dga2.h" #endif @@ -2183,5 +2181,3 @@ void X11DRV_EVENT_WaitShmCompletions( Drawable dw ) } #endif /* defined(HAVE_LIBXXSHM) */ - -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/windows/x11drv/init.c b/windows/x11drv/init.c index 37616fe321a..e840d68004f 100644 --- a/windows/x11drv/init.c +++ b/windows/x11drv/init.c @@ -4,10 +4,6 @@ * Copyright 1998 Patrik Stridvall */ -#include "config.h" - -#ifndef X_DISPLAY_MISSING - #include "clipboard.h" #include "monitor.h" #include "user.h" @@ -46,6 +42,4 @@ WND_DRIVER X11DRV_WND_Driver = X11DRV_WND_IsSelfClipping }; -#endif /* !defined(X_DISPLAY_MISSING) */ - diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c index 29d6b984c5f..951a00847be 100644 --- a/windows/x11drv/keyboard.c +++ b/windows/x11drv/keyboard.c @@ -11,16 +11,16 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - -#include -#include #include #include + #include "ts_xlib.h" #include "ts_xresource.h" #include "ts_xutil.h" +#include +#include + #include "windef.h" #include "wingdi.h" #include "wine/winuser16.h" @@ -1567,6 +1567,3 @@ extern void X11DRV_KEYBOARD_SetKeyboardConfig(KEYBOARD_CONFIG *cfg, DWORD mask) TSXChangeKeyboardControl(display, X_mask, &xkc); } - -#endif /* !defined(X_DISPLAY_MISSING) */ - diff --git a/windows/x11drv/mouse.c b/windows/x11drv/mouse.c index 9a7a9d5e708..1a099172b5c 100644 --- a/windows/x11drv/mouse.c +++ b/windows/x11drv/mouse.c @@ -6,8 +6,6 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include "ts_xlib.h" #include "callback.h" @@ -272,6 +270,3 @@ void X11DRV_MOUSE_Init() GetTickCount(), 0); } - - -#endif /* !defined(X_DISPLAY_MISSING) */ diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c index a991f3f2548..c8272baf372 100644 --- a/windows/x11drv/wnd.c +++ b/windows/x11drv/wnd.c @@ -8,14 +8,14 @@ #include "config.h" -#ifndef X_DISPLAY_MISSING - #include + #include "ts_xlib.h" #include "ts_xutil.h" #include #include + #include "bitmap.h" #include "color.h" #include "debugtools.h" @@ -882,4 +882,4 @@ void X11DRV_WND_DockWindow(WND *wndPtr) display,win,kwmDockWindow,kwmDockWindow,32,PropModeReplace,(char*)&data,1 ); } -#endif /* !defined(X_DISPLAY_MISSING) */ +