Removed X_DISPLAY_MISSING.
diff --git a/graphics/x11drv/bitblt.c b/graphics/x11drv/bitblt.c
index a27ff0d..396d363 100644
--- a/graphics/x11drv/bitblt.c
+++ b/graphics/x11drv/bitblt.c
@@ -6,9 +6,8 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Intrinsic.h>
+
#include "ts_xlib.h"
#include <assert.h>
@@ -1542,4 +1541,3 @@
return result;
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c
index 65468bb..67f3d08 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 @@
return (Pixmap)bmp->physBitmap;
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/graphics/x11drv/brush.c b/graphics/x11drv/brush.c
index a48f588..d5a090a 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 <stdlib.h>
@@ -285,6 +283,3 @@
return prevHandle;
}
-
-#endif /* !defined(X_DISPLAY_MISSING) */
-
diff --git a/graphics/x11drv/clipping.c b/graphics/x11drv/clipping.c
index 1f3bc9d..5905217 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 <stdio.h>
+
#include "dc.h"
#include "x11drv.h"
#include "region.h"
@@ -74,5 +73,3 @@
GDI_HEAP_UNLOCK( dc->w.hGCClipRgn );
}
-#endif /* !defined(X_DISPLAY_MISSING) */
-
diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c
index 6f7a109..8017267 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 @@
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 3332759..e470674 100644
--- a/graphics/x11drv/graphics.c
+++ b/graphics/x11drv/graphics.c
@@ -11,9 +11,8 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Intrinsic.h>
+
#include "ts_xlib.h"
#include "ts_xutil.h"
@@ -1352,4 +1351,3 @@
return TRUE;
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/graphics/x11drv/init.c b/graphics/x11drv/init.c
index 92ce48b..13b7b74 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 <string.h>
@@ -312,4 +310,3 @@
return 0;
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/graphics/x11drv/objects.c b/graphics/x11drv/objects.c
index 497abe1..ec3576f 100644
--- a/graphics/x11drv/objects.c
+++ b/graphics/x11drv/objects.c
@@ -6,10 +6,9 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <stdlib.h>
#include <stdio.h>
+
#include "bitmap.h"
#include "brush.h"
#include "font.h"
@@ -88,4 +87,3 @@
return ret;
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/graphics/x11drv/oembitmap.c b/graphics/x11drv/oembitmap.c
index ab4c8cb..4d3872f 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 @@
return 1;
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/graphics/x11drv/palette.c b/graphics/x11drv/palette.c
index 7bd0fcc..0878334 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 <stdlib.h>
@@ -992,4 +990,3 @@
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 4e9d6ca..33cbdd2 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 @@
return prevHandle;
}
-
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c
index 7bea663..9e42f80 100644
--- a/graphics/x11drv/text.c
+++ b/graphics/x11drv/text.c
@@ -6,14 +6,14 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xatom.h>
+
#include "ts_xlib.h"
#include <stdlib.h>
-#include "windef.h"
#include <math.h>
+
+#include "windef.h"
#include "dc.h"
#include "gdi.h"
#include "heap.h"
@@ -371,4 +371,3 @@
return TRUE;
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c
index 3d60cef..db708da 100644
--- a/graphics/x11drv/xfont.c
+++ b/graphics/x11drv/xfont.c
@@ -9,11 +9,9 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
#include <X11/Xatom.h>
+
#include "ts_xlib.h"
-#include "x11font.h"
-#endif /* !defined(X_DISPLAY_MISSING) */
#include <ctype.h>
#include <stdio.h>
@@ -25,6 +23,7 @@
#include <fcntl.h>
#include <math.h>
#include <assert.h>
+
#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 @@
}
return FALSE;
}
-
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/include/ts_xf86dga.h b/include/ts_xf86dga.h
index 8a48f54..39efc01 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 <X11/Xlib.h>
@@ -30,6 +28,4 @@
#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 a901e8a..3c74687 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 <X11/Xlib.h>
@@ -39,6 +37,4 @@
#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 77911f5..65d7264 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 @@
#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 b3fb97c..a520830 100644
--- a/include/ts_xlib.h
+++ b/include/ts_xlib.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xlib.h>
@@ -143,6 +141,4 @@
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 2a1380b..a12eb67 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 <X11/xpm.h>
@@ -22,6 +20,4 @@
#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 394b9f5..73953f2 100644
--- a/include/ts_xresource.h
+++ b/include/ts_xresource.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@@ -25,6 +23,4 @@
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 9058d86..f1b0219 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 <X11/Xlib.h>
@@ -30,6 +28,4 @@
#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 af3434a..007b2b2 100644
--- a/include/ts_xutil.h
+++ b/include/ts_xutil.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@@ -54,6 +52,4 @@
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 f3c3793..26e48a6 100644
--- a/include/x11drv.h
+++ b/include/x11drv.h
@@ -7,18 +7,18 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
-#endif /* !defined(X_DISPLAY_MISSING) */
+#ifdef HAVE_LIBXXSHM
+# include <X11/extensions/XShm.h>
+#endif /* defined(HAVE_LIBXXSHM) */
#include "gdi.h"
#include "winbase.h"
#include "windef.h"
-#include <X11/extensions/XShm.h>
struct tagBITMAPOBJ;
struct tagCLASS;
diff --git a/tools/make_X11wrappers b/tools/make_X11wrappers
index 61b5c23..c443ff3 100755
--- a/tools/make_X11wrappers
+++ b/tools/make_X11wrappers
@@ -95,8 +95,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
$pre_file
$x11_incl#include <X11/$extensions_dir$inc_name.h>
@@ -111,8 +109,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
$pre_file
$x11_incl#include <X11/$extensions_dir$inc_name.h>
@@ -375,14 +371,11 @@
print OUTH <<END;
$post_file
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_$ucname\_H */
END
print OUTC <<END;
$post_file
-#endif /* !defined(X_DISPLAY_MISSING) */
END
diff --git a/tsx11/ts_xf86dga.c b/tsx11/ts_xf86dga.c
index c28a48f..62d94ba 100644
--- a/tsx11/ts_xf86dga.c
+++ b/tsx11/ts_xf86dga.c
@@ -6,8 +6,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#ifdef HAVE_LIBXXF86DGA
#include <X11/Xlib.h>
@@ -120,4 +118,3 @@
#endif /* defined(HAVE_LIBXXF86DGA) */
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/tsx11/ts_xf86dga2.c b/tsx11/ts_xf86dga2.c
index 50c007f..d8e16e0 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 <X11/Xlib.h>
@@ -199,4 +197,3 @@
#endif /* defined(HAVE_LIBXXF86DGA2) */
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/tsx11/ts_xf86vmode.c b/tsx11/ts_xf86vmode.c
index 035404a..090095a 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 @@
#endif /* defined(HAVE_LIBXXF86VM) */
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/tsx11/ts_xlib.c b/tsx11/ts_xlib.c
index 44e238b..c54e366 100644
--- a/tsx11/ts_xlib.c
+++ b/tsx11/ts_xlib.c
@@ -6,8 +6,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xlib.h>
@@ -1391,4 +1389,3 @@
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/tsx11/ts_xpm.c b/tsx11/ts_xpm.c
index 115a806..648f355 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 <X11/xpm.h>
@@ -42,4 +40,3 @@
#endif /* defined(HAVE_LIBXXPM) */
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/tsx11/ts_xresource.c b/tsx11/ts_xresource.c
index c5bbfa5..ef45063 100644
--- a/tsx11/ts_xresource.c
+++ b/tsx11/ts_xresource.c
@@ -6,8 +6,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@@ -81,4 +79,3 @@
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/tsx11/ts_xshm.c b/tsx11/ts_xshm.c
index c42f377..87ad78d 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 <X11/Xlib.h>
@@ -120,4 +118,3 @@
#endif /* defined(HAVE_LIBXXSHM) */
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/tsx11/ts_xutil.c b/tsx11/ts_xutil.c
index 3e7bdc1..638a614 100644
--- a/tsx11/ts_xutil.c
+++ b/tsx11/ts_xutil.c
@@ -6,8 +6,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@@ -390,4 +388,3 @@
}
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c
index f9cf96e..52ce5dc 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -47,17 +47,16 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
+#include <X11/Xatom.h>
+
+#include "ts_xlib.h"
#include <errno.h>
-#include <X11/Xatom.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
-#include "ts_xlib.h"
-
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
@@ -1239,5 +1238,3 @@
else prop = &(*prop)->next;
}
}
-
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index 3e63b9e..bcb8fd2 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -7,17 +7,15 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xatom.h>
#include <X11/keysym.h>
+
#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 @@
}
#endif /* defined(HAVE_LIBXXSHM) */
-
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/windows/x11drv/init.c b/windows/x11drv/init.c
index 37616fe..e840d68 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 @@
X11DRV_WND_IsSelfClipping
};
-#endif /* !defined(X_DISPLAY_MISSING) */
-
diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c
index 29d6b98..951a008 100644
--- a/windows/x11drv/keyboard.c
+++ b/windows/x11drv/keyboard.c
@@ -11,16 +11,16 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
-#include <ctype.h>
-#include <string.h>
#include <X11/Xatom.h>
#include <X11/keysym.h>
+
#include "ts_xlib.h"
#include "ts_xresource.h"
#include "ts_xutil.h"
+#include <ctype.h>
+#include <string.h>
+
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
@@ -1567,6 +1567,3 @@
TSXChangeKeyboardControl(display, X_mask, &xkc);
}
-
-#endif /* !defined(X_DISPLAY_MISSING) */
-
diff --git a/windows/x11drv/mouse.c b/windows/x11drv/mouse.c
index 9a7a9d5..1a09917 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 @@
GetTickCount(),
0);
}
-
-
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c
index a991f3f..c8272ba 100644
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@@ -8,14 +8,14 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xatom.h>
+
#include "ts_xlib.h"
#include "ts_xutil.h"
#include <stdlib.h>
#include <string.h>
+
#include "bitmap.h"
#include "color.h"
#include "debugtools.h"
@@ -882,4 +882,4 @@
display,win,kwmDockWindow,kwmDockWindow,32,PropModeReplace,(char*)&data,1
);
}
-#endif /* !defined(X_DISPLAY_MISSING) */
+
