Regenerated headers from IDL files with MIDL-compatible guards git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4896 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/include/amvideo.h b/mingw-w64-headers/direct-x/include/amvideo.h index c0e463d..a93ecd5 100644 --- a/mingw-w64-headers/direct-x/include/amvideo.h +++ b/mingw-w64-headers/direct-x/include/amvideo.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_AMVIDEO_H -#define __WIDL_AMVIDEO_H +#ifndef __amvideo_h__ +#define __amvideo_h__ /* Forward declarations */ @@ -1296,4 +1296,4 @@ } #endif -#endif /* __WIDL_AMVIDEO_H */ +#endif /* __amvideo_h__ */
diff --git a/mingw-w64-headers/direct-x/include/austream.h b/mingw-w64-headers/direct-x/include/austream.h index b1e0835..cf36a9e 100644 --- a/mingw-w64-headers/direct-x/include/austream.h +++ b/mingw-w64-headers/direct-x/include/austream.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_AUSTREAM_H -#define __WIDL_AUSTREAM_H +#ifndef __austream_h__ +#define __austream_h__ /* Forward declarations */ @@ -536,4 +536,4 @@ } #endif -#endif /* __WIDL_AUSTREAM_H */ +#endif /* __austream_h__ */
diff --git a/mingw-w64-headers/direct-x/include/ddstream.h b/mingw-w64-headers/direct-x/include/ddstream.h index 94a8971..af9e6c7 100644 --- a/mingw-w64-headers/direct-x/include/ddstream.h +++ b/mingw-w64-headers/direct-x/include/ddstream.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_DDSTREAM_H -#define __WIDL_DDSTREAM_H +#ifndef __ddstream_h__ +#define __ddstream_h__ /* Forward declarations */ @@ -404,4 +404,4 @@ } #endif -#endif /* __WIDL_DDSTREAM_H */ +#endif /* __ddstream_h__ */
diff --git a/mingw-w64-headers/direct-x/include/mediaobj.h b/mingw-w64-headers/direct-x/include/mediaobj.h index ea689b9..25e0a3d 100644 --- a/mingw-w64-headers/direct-x/include/mediaobj.h +++ b/mingw-w64-headers/direct-x/include/mediaobj.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_MEDIAOBJ_H -#define __WIDL_MEDIAOBJ_H +#ifndef __mediaobj_h__ +#define __mediaobj_h__ /* Forward declarations */ @@ -187,4 +187,4 @@ } #endif -#endif /* __WIDL_MEDIAOBJ_H */ +#endif /* __mediaobj_h__ */
diff --git a/mingw-w64-headers/direct-x/include/mmstream.h b/mingw-w64-headers/direct-x/include/mmstream.h index f630647..7c772e8 100644 --- a/mingw-w64-headers/direct-x/include/mmstream.h +++ b/mingw-w64-headers/direct-x/include/mmstream.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_MMSTREAM_H -#define __WIDL_MMSTREAM_H +#ifndef __mmstream_h__ +#define __mmstream_h__ /* Forward declarations */ @@ -630,4 +630,4 @@ } #endif -#endif /* __WIDL_MMSTREAM_H */ +#endif /* __mmstream_h__ */
diff --git a/mingw-w64-headers/direct-x/include/vmr9.h b/mingw-w64-headers/direct-x/include/vmr9.h index b920594..d546755 100644 --- a/mingw-w64-headers/direct-x/include/vmr9.h +++ b/mingw-w64-headers/direct-x/include/vmr9.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_VMR9_H -#define __WIDL_VMR9_H +#ifndef __vmr9_h__ +#define __vmr9_h__ /* Forward declarations */ @@ -2508,4 +2508,4 @@ } #endif -#endif /* __WIDL_VMR9_H */ +#endif /* __vmr9_h__ */
diff --git a/mingw-w64-headers/include/comcat.h b/mingw-w64-headers/include/comcat.h index cd2ddc0..af371ea 100644 --- a/mingw-w64-headers/include/comcat.h +++ b/mingw-w64-headers/include/comcat.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_COMCAT_H -#define __WIDL_COMCAT_H +#ifndef __comcat_h__ +#define __comcat_h__ /* Forward declarations */ @@ -30,7 +30,6 @@ extern "C" { #endif -#define __comcat_h__ #ifndef __IEnumCATEGORYINFO_FWD_DEFINED__ #define __IEnumCATEGORYINFO_FWD_DEFINED__ typedef struct IEnumCATEGORYINFO IEnumCATEGORYINFO; @@ -414,4 +413,4 @@ } #endif -#endif /* __WIDL_COMCAT_H */ +#endif /* __comcat_h__ */
diff --git a/mingw-w64-headers/include/comcat.idl b/mingw-w64-headers/include/comcat.idl index 2edff5b..2f2b9e9 100644 --- a/mingw-w64-headers/include/comcat.idl +++ b/mingw-w64-headers/include/comcat.idl
@@ -4,8 +4,6 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -cpp_quote("#define __comcat_h__") - #ifndef DO_NO_IMPORTS import "unknwn.idl"; #endif
diff --git a/mingw-w64-headers/include/msctf.h b/mingw-w64-headers/include/msctf.h index 97bfb63..a9d8cbe 100644 --- a/mingw-w64-headers/include/msctf.h +++ b/mingw-w64-headers/include/msctf.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_MSCTF_H -#define __WIDL_MSCTF_H +#ifndef __msctf_h__ +#define __msctf_h__ /* Forward declarations */ @@ -6738,4 +6738,4 @@ } #endif -#endif /* __WIDL_MSCTF_H */ +#endif /* __msctf_h__ */
diff --git a/mingw-w64-headers/include/oaidl.h b/mingw-w64-headers/include/oaidl.h index 4bfe64c..345335a 100644 --- a/mingw-w64-headers/include/oaidl.h +++ b/mingw-w64-headers/include/oaidl.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_OAIDL_H -#define __WIDL_OAIDL_H +#ifndef __oaidl_h__ +#define __oaidl_h__ /* Forward declarations */ @@ -45,7 +45,6 @@ extern "C" { #endif -#define __oaidl_h__ #ifndef __IDispatch_FWD_DEFINED__ #define __IDispatch_FWD_DEFINED__ typedef interface IDispatch IDispatch; @@ -3049,4 +3048,4 @@ } #endif -#endif /* __WIDL_OAIDL_H */ +#endif /* __oaidl_h__ */
diff --git a/mingw-w64-headers/include/oaidl.idl b/mingw-w64-headers/include/oaidl.idl index 4d5b618..494af25 100644 --- a/mingw-w64-headers/include/oaidl.idl +++ b/mingw-w64-headers/include/oaidl.idl
@@ -8,8 +8,6 @@ import "objidl.idl"; #endif -cpp_quote("#define __oaidl_h__") - interface IDispatch; interface IRecordInfo; interface ITypeInfo;
diff --git a/mingw-w64-headers/include/objidl.h b/mingw-w64-headers/include/objidl.h index 028ad71..204b356 100644 --- a/mingw-w64-headers/include/objidl.h +++ b/mingw-w64-headers/include/objidl.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_OBJIDL_H -#define __WIDL_OBJIDL_H +#ifndef __objidl_h__ +#define __objidl_h__ /* Forward declarations */ @@ -7076,4 +7076,4 @@ } #endif -#endif /* __WIDL_OBJIDL_H */ +#endif /* __objidl_h__ */
diff --git a/mingw-w64-headers/include/shobjidl.h b/mingw-w64-headers/include/shobjidl.h index c1e48f4..6262b5e 100644 --- a/mingw-w64-headers/include/shobjidl.h +++ b/mingw-w64-headers/include/shobjidl.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_SHOBJIDL_H -#define __WIDL_SHOBJIDL_H +#ifndef __shobjidl_h__ +#define __shobjidl_h__ /* Forward declarations */ @@ -7195,4 +7195,4 @@ } #endif -#endif /* __WIDL_SHOBJIDL_H */ +#endif /* __shobjidl_h__ */
diff --git a/mingw-w64-headers/include/shtypes.h b/mingw-w64-headers/include/shtypes.h index 8d08158..4500933 100644 --- a/mingw-w64-headers/include/shtypes.h +++ b/mingw-w64-headers/include/shtypes.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_SHTYPES_H -#define __WIDL_SHTYPES_H +#ifndef __shtypes_h__ +#define __shtypes_h__ /* Forward declarations */ @@ -25,7 +25,6 @@ extern "C" { #endif -#define __shtypes_h__ #ifndef __MIDL_user_allocate_free_DEFINED__ #define __MIDL_user_allocate_free_DEFINED__ void *__RPC_API MIDL_user_allocate(size_t); @@ -166,4 +165,4 @@ } #endif -#endif /* __WIDL_SHTYPES_H */ +#endif /* __shtypes_h__ */
diff --git a/mingw-w64-headers/include/shtypes.idl b/mingw-w64-headers/include/shtypes.idl index 28ad9ac..41bd0a2 100644 --- a/mingw-w64-headers/include/shtypes.idl +++ b/mingw-w64-headers/include/shtypes.idl
@@ -6,8 +6,6 @@ import "wtypes.idl"; -cpp_quote("#define __shtypes_h__") - cpp_quote("#ifndef __MIDL_user_allocate_free_DEFINED__") cpp_quote("#define __MIDL_user_allocate_free_DEFINED__") cpp_quote(" void *__RPC_API MIDL_user_allocate(size_t);")
diff --git a/mingw-w64-headers/include/textstor.h b/mingw-w64-headers/include/textstor.h index 8d6b900..e3a0c5d 100644 --- a/mingw-w64-headers/include/textstor.h +++ b/mingw-w64-headers/include/textstor.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_TEXTSTOR_H -#define __WIDL_TEXTSTOR_H +#ifndef __textstor_h__ +#define __textstor_h__ /* Forward declarations */ @@ -1019,4 +1019,4 @@ } #endif -#endif /* __WIDL_TEXTSTOR_H */ +#endif /* __textstor_h__ */
diff --git a/mingw-w64-headers/include/unknwn.h b/mingw-w64-headers/include/unknwn.h index a3ebcc4..702df81 100644 --- a/mingw-w64-headers/include/unknwn.h +++ b/mingw-w64-headers/include/unknwn.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_UNKNWN_H -#define __WIDL_UNKNWN_H +#ifndef __unknwn_h__ +#define __unknwn_h__ /* Forward declarations */ @@ -404,4 +404,4 @@ } #endif -#endif /* __WIDL_UNKNWN_H */ +#endif /* __unknwn_h__ */
diff --git a/mingw-w64-headers/include/wtypes.h b/mingw-w64-headers/include/wtypes.h index f4a4895..b3b8d2f 100644 --- a/mingw-w64-headers/include/wtypes.h +++ b/mingw-w64-headers/include/wtypes.h
@@ -12,8 +12,8 @@ #include <ole2.h> #endif -#ifndef __WIDL_WTYPES_H -#define __WIDL_WTYPES_H +#ifndef __wtypes_h__ +#define __wtypes_h__ /* Forward declarations */ @@ -835,4 +835,4 @@ } #endif -#endif /* __WIDL_WTYPES_H */ +#endif /* __wtypes_h__ */