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/winms.h | |
| parent | dfdbb60bf5f613b3554d5435f08f16bde72aa353 (diff) | |
Bug 777: Merge from CYGWIN branch
Diffstat (limited to 'hw/xwin/winms.h')
| -rw-r--r-- | hw/xwin/winms.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h index ad20348b6..cbd3dfbea 100644 --- a/hw/xwin/winms.h +++ b/hw/xwin/winms.h @@ -1,5 +1,7 @@ +#ifndef _WINMS_H_ +#define _WINMS_H_ /* - *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,22 +17,18 @@ *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/winms.h,v 1.1 2001/04/05 20:13:50 dawes Exp $ */ - -#ifndef _WINMS_H_ -#define _WINMS_H_ #undef MINSHORT #undef MAXSHORT @@ -44,6 +42,9 @@ #define WIN32_LEAN_AND_MEAN #endif +#ifndef XFree86Server +#define XFree86Server +#endif #include <windows.h> #include <windowsx.h> |