diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-12-05 21:24:48 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-12-05 21:24:48 +0000 |
| commit | 9bd1328c49aafae67a6a6d9fd17063c75d8547a2 (patch) | |
| tree | 7095a16dfea3dcff6b11049374b1f8befff25dd3 /hw/xwin/winms.h | |
| parent | bf0a760331e2fe4dbc00e78f87022c7464d9ca4f (diff) | |
redone ddraw.h to be able to mix it with w32api style COM header files.
obj_base.h is not needed anymore. Using <objbase.h> instead.
Use Xwindows.h instead of windows.h
do not include win_ms.h
remove extra definition of sleep()
Set HOME to Documents and Settings/username if not set
Use Xming basedir instead of ProjectRoot for system.XWinrc
Fix callback functions to use wBOOL instead of BOOL
Fix compiler warnings. Added debug output.
Fix warning about undefined macro max
Diffstat (limited to 'hw/xwin/winms.h')
| -rw-r--r-- | hw/xwin/winms.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h index cbd3dfbea..f3efecd5d 100644 --- a/hw/xwin/winms.h +++ b/hw/xwin/winms.h @@ -30,33 +30,17 @@ * Authors: Harold L Hunt II */ -#undef MINSHORT -#undef MAXSHORT -#undef CARD8 -#undef INT32 -#undef ATOM - #define NONAMELESSUNION #define DIRECTDRAW_VERSION 0x0300 #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#ifndef XFree86Server -#define XFree86Server -#endif -#include <windows.h> +#include <Xwindows.h> #include <windowsx.h> -#include "obj_base.h" #include "ddraw.h" -/* - * Undefine unneeded Windows symbols that conflict - * with X symbols - */ - #undef CreateWindow -#undef FreeResource #endif /* _WINMS_H_ */ |