commit 8d8703cb489c477260ebc360e683d40ac8070b4c
author Patrik Stridvall <ps@leissner.se> Thu Feb 04 14:05:38 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Feb 04 14:05:38 1999 +0000
tree 23ff394f3ce3d01e41dd662ee9b6cf4025b698fc
parent c6e6a9aff99daed073e35b1be48b4107e23a88f7

Moved some more code to the X11 driver.

include/ddraw.h

diff --git a/include/ddraw.h b/include/ddraw.h
index 61d2b9e..f2ccb0c 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -1,16 +1,12 @@
 #ifndef __WINE_DDRAW_H
 #define __WINE_DDRAW_H
 
-#include "wine/obj_base.h"
-
-#include "config.h"
-
-#ifndef X_DISPLAY_MISSING
 #include <X11/Xlib.h>
 #ifdef HAVE_LIBXXSHM
 #include <X11/extensions/XShm.h>
 #endif /* defined(HAVE_LIBXXSHM) */
-#endif /* !defined(X_DISPLAY_MISSING) */
+
+#include "wine/obj_base.h"
 
 #ifndef	DIRECTDRAW_VERSION
 #define	DIRECTDRAW_VERSION	0x0500
@@ -936,7 +932,7 @@
 struct _xlib_directdrawdata {
 #ifdef HAVE_LIBXXSHM
     int xshm_active;
-#endif
+#endif /* defined(HAVE_LIBXXSHM) */
     
     /* are these needed for anything? (draw_surf is the active surface)
     IDirectDrawSurface	*surfs;