diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-06-21 13:19:32 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-06-21 13:19:32 +0000 |
| commit | d6e8b1affec7351549c0006cc63b6923091cdd68 (patch) | |
| tree | 6e5e9dd1c1ec6e141349337df844b649bbf4277d /hw/xwin/winmisc.c | |
| parent | dfdbb60bf5f613b3554d5435f08f16bde72aa353 (diff) | |
Bug 777: Merge from CYGWIN branch
Diffstat (limited to 'hw/xwin/winmisc.c')
| -rw-r--r-- | hw/xwin/winmisc.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/hw/xwin/winmisc.c b/hw/xwin/winmisc.c index e93d1fd93..a116043a8 100644 --- a/hw/xwin/winmisc.c +++ b/hw/xwin/winmisc.c @@ -1,5 +1,5 @@ /* - *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. + *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved. * *Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -15,23 +15,22 @@ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR + *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - *Except as contained in this notice, the name of the XFree86 Project + *Except as contained in this notice, the name of Harold L Hunt II *shall not be used in advertising or otherwise to promote the sale, use *or other dealings in this Software without prior written authorization - *from the XFree86 Project. + *from Harold L Hunt II. * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.5 2001/11/11 22:45:57 alanh Exp $ */ #include "win.h" - +#ifdef XWIN_NATIVEGDI /* See Porting Layer Definition - p. 33 */ /* * Called by clients, returns the best size for a cursor, tile, or @@ -44,6 +43,7 @@ winQueryBestSizeNativeGDI (int class, unsigned short *pWidth, { ErrorF ("winQueryBestSizeNativeGDI\n"); } +#endif /* @@ -96,6 +96,7 @@ winUpdateFBPointer (ScreenPtr pScreen, void *pbits) } +#ifdef XWIN_NATIVEGDI /* * Paint the window background with the specified color */ @@ -145,3 +146,4 @@ winPaintBackground (HWND hwnd, COLORREF colorref) return TRUE; } +#endif |