Include xwin-config.h if HAVE_XWIN_CONFIG is defined Cleanup X11 includes

handling Warning fixes

hw/xwin/ChangeLog

@@ -1,3 +1,10 @@
+2005-07-05  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* *.c:
+	Include xwin-config.h if HAVE_XWIN_CONFIG is defined
+	Cleanup X11 includes handling
+	Warning fixes
+	
 2005-06-30  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* winmultiwindowwndproc.c:

hw/xwin/InitInput.c

@@ -28,6 +28,9 @@
 */
 /* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.11 2002/07/05 09:19:25 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #ifdef XWIN_CLIPBOARD
 # include "../../Xext/xf86miscproc.h"

hw/xwin/InitOutput.c

@@ -28,6 +28,9 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.34 2003/10/02 13:30:09 eich Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 #include "winconfig.h"
@@ -35,6 +38,9 @@ from The Open Group.
 #ifdef XWIN_CLIPBOARD
 #include "X11/Xlocale.h"
 #endif
+#ifdef DPMSExtension
+#include "dpmsproc.h"
+#endif
 #ifdef __CYGWIN__
 #include <mntent.h>
 #endif
@@ -123,7 +129,6 @@ winLogVersionInfo (void);
 Bool
 winValidateArgs (void);
 
-
 /*
  * For the depth 24 pixmap we default to 32 bits per pixel, but
  * we change this pixmap format later if we detect that the display
@@ -285,7 +290,7 @@ AbortDDX (void)
 
 #ifdef __CYGWIN__
 /* hasmntopt is currently not implemented for cygwin */
-const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
+static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
 {
     const char *s;
     size_t len;
@@ -305,7 +310,7 @@ const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
     return NULL;
 }
 
-void
+static void
 winCheckMount(void)
 {
   FILE *mnt;
@@ -367,13 +372,14 @@ winCheckMount(void)
    winMsg(X_WARNING, "/tmp mounted int textmode\n"); 
 }
 #else
-void
+static void
 winCheckMount(void) 
 {
 }
 #endif
 
-const char * 
+#ifdef RELOCATE_PROJECTROOT
+static const char * 
 winGetBaseDir(void)
 {
     static BOOL inited = FALSE;
@@ -400,6 +406,7 @@ winGetBaseDir(void)
     }
     return buffer;
 }
+#endif
 
 static void
 winFixupPaths (void)
@@ -749,7 +756,7 @@ OsVendorInit (void)
 }
 
 
-void
+static void
 winUseMsg (void)
 {
   ErrorF ("-depth bits_per_pixel\n"
@@ -1141,3 +1148,20 @@ winCheckDisplayNumber ()
 
   return TRUE;
 }
+
+#ifdef DPMSExtension
+Bool DPMSSupported(void)
+{
+  return FALSE;
+}
+
+void DPMSSet(int level)
+{
+  return;
+}
+
+int DPMSGet(int *plevel)
+{
+  return 0;
+}
+#endif

hw/xwin/win.h

@@ -963,10 +963,10 @@ winSendKeyEvent (DWORD dwKey, Bool fDown);
  */
 
 Bool
-winInstallKeyboardHookLL ();
+winInstallKeyboardHookLL (void);
 
 void
-winRemoveKeyboardHookLL ();
+winRemoveKeyboardHookLL (void);
 
 
 /*

hw/xwin/winallpriv.c

@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.11 2002/10/17 08:18:21 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winauth.c

@@ -1,3 +1,6 @@
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #if defined(XCSECURITY)
 /*
  *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.

hw/xwin/winblock.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 

hw/xwin/winclip.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* Look at mfb/mfbclip.c for sample implementation */

hw/xwin/winclipboardinit.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "dixstruct.h"
 #include "winclipboard.h"
 

hw/xwin/winclipboardtextconv.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <stdio.h>
 #include <stdlib.h>

hw/xwin/winclipboardthread.c

@@ -28,6 +28,10 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include <sys/types.h>
 #include "winclipboard.h"
 #ifdef __CYGWIN__
 #include <errno.h>

hw/xwin/winclipboardunicode.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "winclipboard.h"
 
 

hw/xwin/winclipboardwndproc.c

@@ -28,6 +28,11 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include <sys/types.h>
+#include <sys/time.h>
 #include "winclipboard.h"
 
 

hw/xwin/winclipboardwrappers.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "dixstruct.h"
 #include <X11/Xatom.h>

hw/xwin/winclipboardxevents.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "winclipboard.h"
 
 

hw/xwin/wincmap.c

@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.9 2002/07/05 09:19:26 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winconfig.c

@@ -29,13 +29,18 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winconfig.h"
 #include "winmsg.h"
 #include "globals.h"
 
 #ifdef XKB
+#ifndef XKB_IN_SERVER
 #define XKB_IN_SERVER
+#endif
 #include <X11/extensions/XKBsrv.h>
 #endif
 

hw/xwin/wincreatewnd.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "shellapi.h"
 

hw/xwin/wincursor.c

@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.5 2002/07/05 09:19:26 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 #include <cursorstr.h>

hw/xwin/windialogs.c

@@ -29,6 +29,9 @@
  *              Earle F. Philhower III
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #ifdef __CYGWIN__
 #include <sys/cygwin.h>

hw/xwin/winengine.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 

hw/xwin/winerror.c

@@ -28,6 +28,15 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#ifdef XVENDORNAME
+#define VENDOR_STRING XVENDORNAME
+#define VERSION_STRING XORG_RELEASE
+#define VENDOR_CONTACT BUILDERADDR
+#endif
+
 #include "win.h"
 
 /* References to external symbols */

hw/xwin/winfillsp.c

@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.9 2001/11/01 12:19:40 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winfont.c

@@ -28,8 +28,12 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
+#ifdef XWIN_NATIVEGDI
 /* See Porting Layer Definition - p. 32 */
 /* See mfb/mfbfont.c - mfbRealizeFont() - which is empty :) */
 Bool
@@ -73,3 +77,4 @@ winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont)
 #endif
   return TRUE;
 }
+#endif

hw/xwin/wingc.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 void
@@ -230,7 +233,6 @@ winDestroyGCNativeGDI (GCPtr pGC)
   winSetGCPriv (pGC, NULL);
 }
 
-
 #if 0
 /* See Porting Layer Definition - p. 46 */
 static void

hw/xwin/wingetsp.c

@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.7 2001/11/01 12:19:40 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* See Porting Layer Definition - p. 55 */

hw/xwin/winglobals.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winkeybd.c

@@ -33,13 +33,18 @@
 /* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.12 2002/10/17 08:18:22 alanh Exp $ */
 
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winkeybd.h"
 #include "winconfig.h"
 #include "winmsg.h"
 
 #ifdef XKB
+#ifndef XKB_IN_SERVER
 #define XKB_IN_SERVER
+#endif
 #include <X11/extensions/XKBsrv.h>
 #endif
 

hw/xwin/winkeyhook.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winkeynames.h

@@ -27,7 +27,7 @@
 
 #define XK_TECHNICAL
 #define	XK_KATAKANA
-#include "keysym.h"
+#include <X11/keysym.h>
 
 #define GLYPHS_PER_KEY	4
 #define NUM_KEYCODES	248

hw/xwin/winmisc.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 #ifdef XWIN_NATIVEGDI

hw/xwin/winmouse.c

@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.3 2001/05/08 08:14:09 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 #if defined(XFree86Server) && defined(XINPUT)

hw/xwin/winms.h

@@ -36,7 +36,7 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-#include <Xwindows.h>
+#include <X11/Xwindows.h>
 #include <windowsx.h>
 
 #include "ddraw.h"

hw/xwin/winmsg.c

@@ -29,6 +29,9 @@
  */
 /* $XFree86$ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 #if CYGDEBUG

hw/xwin/winmultiwindowclass.c

@@ -29,6 +29,9 @@
  */
 /* $XFree86$ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <X11/Xatom.h>
 #include "propertyst.h"
 #include "windowstr.h"

hw/xwin/winmultiwindowicons.c

@@ -29,6 +29,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"

hw/xwin/winmultiwindowshape.c

@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #ifdef SHAPE
 
 #include "win.h"

hw/xwin/winmultiwindowwindow.c

@@ -31,6 +31,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"

hw/xwin/winmultiwindowwm.c

@@ -30,6 +30,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
 /* X headers */
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -63,7 +66,9 @@
 #include "objbase.h"
 #include "ddraw.h"
 #include "winwindow.h"
+#ifdef XWIN_MULTIWINDOWEXTWM
 #include "windowswmstr.h"
+#endif
 
 extern void winDebug(const char *format, ...);
 
@@ -1236,9 +1241,11 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
   pWMInfo->atmWmDelete = XInternAtom (pWMInfo->pDisplay,
 				      "WM_DELETE_WINDOW",
 				      False);
+#ifdef WIN_MULTIWINDOWEXTWM
   pWMInfo->atmPrivMap  = XInternAtom (pWMInfo->pDisplay,
 				      WINDOWSWM_NATIVE_HWND,
 				      False);
+#endif
 
 
   if (1) {

hw/xwin/winmultiwindowwndproc.c

@@ -31,6 +31,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"

hw/xwin/winnativegdi.c

@@ -29,6 +29,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.14 2003/07/29 21:25:18 dawes Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winpfbdd.c

@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.17 2002/10/17 08:18:22 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winpixmap.c

@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.10 2002/10/17 08:18:24 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winpntwin.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* See Porting Layer Definition - p. 39

hw/xwin/winpolyline.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* See Porting Layer Definition - p. 50 */

hw/xwin/winprefs.c

@@ -29,6 +29,9 @@
  */
 /* $XFree86: $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef __CYGWIN__
@@ -36,7 +39,7 @@
 #endif
 #include "win.h"
 
-#include <Xwindows.h>
+#include <X11/Xwindows.h>
 #include <shellapi.h>
 
 #include "winprefs.h"

hw/xwin/winprefs.h

@@ -39,7 +39,7 @@
 /* Need to know how long paths can be... */
 #include <limits.h>
 /* Xwindows redefines PATH_MAX to at least 1024 */
-#include <Xwindows.h>
+#include <X11/Xwindows.h>
 
 #ifndef NAME_MAX
 #define NAME_MAX PATH_MAX

hw/xwin/winprefsyacc.y

@@ -30,6 +30,9 @@
  */
 /* $XFree86: $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

hw/xwin/winpriv.c

@@ -4,6 +4,9 @@
  * Authors: Alexander Gottwald
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winpriv.h"
 #include "winwindow.h"

hw/xwin/winprocarg.c

@@ -26,6 +26,14 @@ from The Open Group.
 
 */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#ifdef XVENDORNAME
+#define VENDOR_STRING XVENDORNAME
+#define VERSION_STRING XORG_RELEASE
+#define VENDOR_CONTACT BUILDERADDR
+#endif
 #include "win.h"
 #include "winconfig.h"
 #include "winprefs.h"
@@ -72,7 +80,7 @@ ENUMDISPLAYMONITORSPROC _EnumDisplayMonitors;
 
 wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data);
 
-Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
+static Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
 {
     /* Load EnumDisplayMonitors from DLL */
     HMODULE user32;

hw/xwin/winpushpxl.c

@@ -45,6 +45,9 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <X11/X.h>
 #include "gcstruct.h"
 #include "scrnintstr.h"

hw/xwin/winrandr.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winregistry.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* Prototypes */

hw/xwin/winrop.c

@@ -32,6 +32,9 @@
 /*
  * Raster operations used by Windows translated to X's 16 rop codes...
  */
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 void

hw/xwin/winscrinit.c

@@ -33,6 +33,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.27 2003/07/29 21:25:18 dawes Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 #include "safeAlpha.h"	

hw/xwin/winsetsp.c

@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.7 2001/11/01 12:19:42 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winshaddd.c

@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.22 2002/10/17 08:18:24 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winshadddnl.c

@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winshadgdi.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/wintrayicon.c

@@ -30,6 +30,9 @@
  */
 /* $XFree86: $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <shellapi.h>
 #include "winprefs.h"
@@ -111,7 +114,7 @@ winHandleIconMessage (HWND hwnd, UINT message,
 		      WPARAM wParam, LPARAM lParam,
 		      winPrivScreenPtr pScreenPriv)
 {
-#ifdef XWIN_MULTIWINDOWEXTWM
+#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_MULTIWINDOW)
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
 #endif
 

hw/xwin/winvalargs.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 

hw/xwin/winvideo.c

@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvproto.h>

hw/xwin/winwakeup.c

@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.6 2002/10/17 08:18:25 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winwin32rootless.c

@@ -32,6 +32,9 @@
 /*
  * Look at hw/darwin/quartz/xpr/xprFrame.c and hw/darwin/quartz/cr/crFrame.c
  */
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <winuser.h>
 #define _WINDOWSWM_SERVER_

hw/xwin/winwin32rootlesswindow.c

@@ -30,6 +30,9 @@
  *		Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winprefs.h"
 

hw/xwin/winwin32rootlesswndproc.c

@@ -29,6 +29,9 @@
  *		Earle F. Philhower, III
  *		Harold L Hunt II
  */
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <winuser.h>
 #define _WINDOWSWM_SERVER_

hw/xwin/winwindow.c

@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.9 2003/11/10 18:22:44 tsi Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 

hw/xwin/winwindowswm.c

@@ -26,6 +26,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 #define NEED_REPLIES

hw/xwin/winwndproc.c

@@ -33,6 +33,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <commctrl.h>
 #include "winprefs.h"