frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed windows.h include for cygwin. 

Bugzilla #1945: Stop unnecessary reordering.
This commit is contained in:
Alexander Gottwald 2004-11-29 12:34:55 +00:00
parent df2f2ff5a4
commit 59ccc6465c
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xwin/ChangeLog
View File

@ -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> 2004-11-24 Alexander Gottwald <ago at freedesktop dot org>
* winmultiwindowwm.c: * winmultiwindowwm.c:

3
hw/xwin/winmultiwindowwindow.c
View File

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

7
hw/xwin/winmultiwindowwm.c
View File

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