- Move some NDK definitions (Cm Callbacks) to the DDK since they are actually public.

[reactos.git] / reactos / w32api / include / windef.h

diff --git a/reactos/w32api/include/windef.h b/reactos/w32api/include/windef.h
index 43fc16b..3cdde6e 100644 (file)
--- a/reactos/w32api/include/windef.h
+++ b/reactos/w32api/include/windef.h
@@ -118,6 +118,9 @@ extern "C" {
 #elif defined(__WATCOMC__)
 #define DECLSPEC_NORETURN
 #define DECLARE_STDCALL_P( type ) type __stdcall
+#elif defined(_MSC_VER)
+#define DECLSPEC_NORETURN __declspec(noreturn)
+#define DECLARE_STDCALL_P( type ) type __stdcall
 #endif /* __GNUC__/__WATCOMC__ */
 #define MAKEWORD(a,b)  ((WORD)(((BYTE)(a))|(((WORD)((BYTE)(b)))<<8)))
 #define MAKELONG(a,b)  ((LONG)(((WORD)(a))|(((DWORD)((WORD)(b)))<<16)))
@@ -151,7 +154,7 @@ extern "C" {
 
 #ifdef __GNUC__
 #ifndef NONAMELESSUNION
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
 #define _ANONYMOUS_UNION __extension__
 #define _ANONYMOUS_STRUCT __extension__
 #else
@@ -160,7 +163,7 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */
 #endif /* NONAMELESSUNION */
-#elif defined(__WATCOMC__)
+#elif defined(__WATCOMC__) || defined(_MSC_VER)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif /* __GNUC__/__WATCOMC__ */
@@ -169,7 +172,6 @@ extern "C" {
 #define _ANONYMOUS_UNION
 #define _UNION_NAME(x) x
 #define DUMMYUNIONNAME u
-#define DUMMYUNIONNAME1        u1
 #define DUMMYUNIONNAME2        u2
 #define DUMMYUNIONNAME3        u3
 #define DUMMYUNIONNAME4        u4
@@ -180,7 +182,6 @@ extern "C" {
 #else
 #define _UNION_NAME(x)
 #define DUMMYUNIONNAME
-#define DUMMYUNIONNAME1
 #define DUMMYUNIONNAME2
 #define DUMMYUNIONNAME3
 #define DUMMYUNIONNAME4
@@ -193,13 +194,11 @@ extern "C" {
 #define _ANONYMOUS_STRUCT
 #define _STRUCT_NAME(x) x
 #define DUMMYSTRUCTNAME        s
-#define DUMMYSTRUCTNAME1 s1
 #define DUMMYSTRUCTNAME2 s2
 #define DUMMYSTRUCTNAME3 s3
 #else
 #define _STRUCT_NAME(x)
 #define DUMMYSTRUCTNAME
-#define DUMMYSTRUCTNAME1
 #define DUMMYSTRUCTNAME2
 #define DUMMYSTRUCTNAME3
 #endif
@@ -223,7 +222,11 @@ extern "C" {
 #define _finally __finally
 #endif
 
-typedef unsigned long DWORD;
+#ifndef DWORD_DEFINED
+#define DWORD_DEFINED
+    typedef unsigned long DWORD;
+#endif//DWORD_DEFINED
+
 typedef int WINBOOL,*PWINBOOL,*LPWINBOOL;
 /* FIXME: Is there a good solution to this? */
 #ifndef XFree86Server
@@ -278,6 +281,7 @@ DECLARE_HANDLE(HKEY);
 /* FIXME: How to handle these. SM_CMONITORS etc in winuser.h also. */
 /* #if (WINVER >= 0x0500) */
 DECLARE_HANDLE(HMONITOR);
+DECLARE_HANDLE(HUMPD);
 #define HMONITOR_DECLARED 1
 DECLARE_HANDLE(HTERMINAL);
 DECLARE_HANDLE(HWINEVENTHOOK);