Fixed windows.h include for cygwin.

Bugzilla #1945: Stop unnecessary reordering.

hw/xwin/ChangeLog

@@ -1,3 +1,11 @@
+2004-11-29  Kensuke Matsuzaki  <zakki@peppermint.jp>
+
+	* winmultiwindowwm.c:
+	Fixed windows.h include for cygwin.
+	
+	* winmultiwindowwindow.c:
+	Bugzilla #1945: Stop unnecessary reordering.
+
 2004-11-24  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* winmultiwindowwm.c:

hw/xwin/winmultiwindowwindow.c

@@ -394,7 +394,8 @@ winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib)
    * Calling winReorderWindowsMultiWindow here means our window manager
    * (i.e. Windows Explorer) has initiative to determine Z order.
    */
-  winReorderWindowsMultiWindow ();
+  if (pWin->nextSib != pOldNextSib)
+    winReorderWindowsMultiWindow ();
 #else
   /* Bail out if no window privates or window handle is invalid */
   if (!pWinPriv || !pWinPriv->hWnd)

hw/xwin/winmultiwindowwm.c

@@ -48,7 +48,14 @@
 #include <X11/cursorfont.h>
 
 /* Windows headers */
+#ifdef __CYGWIN__
+/* Fixups to prevent collisions between Windows and X headers */
+#define ATOM DWORD
+
+#include <windows.h>
+#else
 #include <Xwindows.h>
+#endif
 
 /* Local headers */
 #include "obj_base.h"