From 73b86484b948387f4e73079326a9420e1ebfb38e Mon Sep 17 00:00:00 2001
From: Stefan Ginsberg <stefanginsberg@gmail.com>
Date: Tue, 18 Nov 2008 18:38:58 +0000
Subject: [PATCH] - Add more header guards

svn path=/trunk/; revision=37444
---
 reactos/include/reactos/idl/ms-dtyp.idl | 58 +++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 4 deletions(-)

diff --git a/reactos/include/reactos/idl/ms-dtyp.idl b/reactos/include/reactos/idl/ms-dtyp.idl
index ab762edd242..d2f37162b03 100644
--- a/reactos/include/reactos/idl/ms-dtyp.idl
+++ b/reactos/include/reactos/idl/ms-dtyp.idl
@@ -2,43 +2,82 @@ cpp_quote("#ifndef _DTYP_IDL")
 cpp_quote("#define _DTYP_IDL")
 
 /* Common data types */
-
+cpp_quote("#ifndef _WINDEF_H")
 typedef int BOOL, *PBOOL, *LPBOOL;
 typedef unsigned char BYTE, *PBYTE, *LPBYTE;
-typedef char CHAR, *PCHAR;
 typedef unsigned long DWORD, *PDWORD, *LPDWORD;
+cpp_quote("#endif")
+cpp_quote("#ifndef _BASETSD_H")
 typedef unsigned int DWORD32;
 typedef unsigned __int64 DWORD64;
+cpp_quote("#endif")
 //typedef unsigned long error_status_t;
+cpp_quote("#ifndef _WINDEF_H")
 typedef int INT, *LPINT;
+cpp_quote("#endif")
+cpp_quote("#ifndef _BASETSD_H")
 typedef signed char INT8;
 typedef signed short INT16;
 typedef signed int INT32;
 typedef signed __int64 INT64;
+cpp_quote("#endif")
+cpp_quote("#ifndef _BASETSD_H")
 typedef signed int LONG32;
 typedef signed __int64 LONG64;
+cpp_quote("#endif")
 typedef unsigned __int64 QWORD;
+cpp_quote("#ifndef _WINNT_H")
 typedef short SHORT;
+cpp_quote("#endif")
 typedef __int64 TIME;
+cpp_quote("#ifndef _WINNT_H")
+typedef char CHAR, *PCHAR;
 typedef unsigned char UCHAR, *PUCHAR;
+cpp_quote("#endif")
+cpp_quote("#ifndef _WINDEF_H")
 typedef unsigned int UINT;
+cpp_quote("#endif")
+cpp_quote("#ifndef _BASETSD_H")
 typedef unsigned char UINT8;
 typedef unsigned short UINT16;
 typedef unsigned int UINT32;
 typedef unsigned __int64 UINT64;
+cpp_quote("#endif")
+cpp_quote("#ifndef _WINNT_H")
 typedef unsigned long ULONG, *PULONG;
+cpp_quote("#endif")
+cpp_quote("#ifndef _BASETSD_H")
 typedef unsigned int ULONG32;
 typedef unsigned __int64 ULONG64;
+cpp_quote("#endif")
+cpp_quote("#ifndef _WINNT_H")
 typedef unsigned __int64 ULONGLONG;
 typedef unsigned short USHORT;
+cpp_quote("#endif")
+cpp_quote("#ifndef _WINDEF_H")
 typedef unsigned short WORD, *PWORD, *LPWORD;
-typedef long LONG, *PLONG, *LPLONG;
+cpp_quote("#endif")
+cpp_quote("#ifndef _WINNT_H")
+typedef long LONG, *PLONG;
+cpp_quote("#endif")
+cpp_quote("#ifndef _WINDEF_H")
+typedef long *LPLONG;
+cpp_quote("#endif")
+cpp_quote("#ifndef _WINNT_H")
 typedef signed __int64 LONGLONG;
+cpp_quote("#endif")
 
+cpp_quote("#ifndef _WINDEF_H")
 typedef float FLOAT;
+cpp_quote("#endif")
+cpp_quote("#ifndef __wtypes_h__")
 typedef double DOUBLE;
+cpp_quote("#endif")
 
+cpp_quote("#ifndef _WINNT_H")
 typedef BYTE BOOLEAN, *PBOOLEAN;
+cpp_quote("#endif")
+cpp_quote("#ifndef _BASETSD_H")
 #ifdef _WIN64
 typedef __int64 LONG_PTR;
 typedef unsigned __int64 ULONG_PTR;
@@ -47,17 +86,25 @@ typedef LONG LONG_PTR;
 typedef ULONG ULONG_PTR;
 #endif
 typedef ULONG_PTR SIZE_T;
-typedef DWORD NET_API_STATUS;
 typedef ULONG_PTR DWORD_PTR;
+cpp_quote("#endif")
+typedef DWORD NET_API_STATUS;
+cpp_quote("#ifndef _WINNT_H")
 typedef ULONGLONG DWORDLONG, *PDWORDLONG;
+cpp_quote("#endif")
 typedef DWORD HCALL;
 //typedef DWORD HRESULT;
 
+cpp_quote("#ifndef _WINNT_H")
 typedef void *HANDLE;
 typedef void /*VOID,*/ *PVOID;
+cpp_quote("#endif")
+cpp_quote("#ifndef __WINE_RPCDCE_H")
 typedef void *RPC_BINDING_HANDLE;
+cpp_quote("#endif")
 typedef [context_handle] void *PCONTEXT_HANDLE, *PPCONTEXT_HANDLE;
 
+cpp_quote("#ifndef _WINNT_H")
 typedef wchar_t WCHAR, *PWCHAR;
 cpp_quote("#if 0")
 typedef wchar_t UNICODE;
@@ -66,9 +113,12 @@ typedef const char *LPCSTR;
 typedef const wchar_t *LPCWSTR;
 typedef char *PSTR, *LPSTR;
 typedef wchar_t *LPWSTR, *PWSTR;
+cpp_quote("#endif")
 typedef const wchar_t *LMCSTR;
 typedef WCHAR *LMSTR;
+cpp_quote("#ifndef __wtypes_h__")
 typedef WCHAR *BSTR;
+cpp_quote("#endif")
 
 cpp_quote("#if 0")
 #ifdef Unicode