2011-06-23 Kai Tietz <ktietz@redhat.com> * basetyps.h (DECLARE_INTERFACE_IID_): New macro. * objbase.h: Likewise. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/branches/releases/v1.0@4230 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog index 8e42d9b..8192550 100644 --- a/mingw-w64-headers/include/ChangeLog +++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,8 @@ +2011-06-23 Kai Tietz <ktietz@redhat.com> + + * basetyps.h (DECLARE_INTERFACE_IID_): New macro. + * objbase.h: Likewise. + 2011-06-15 Jonathan Yong <jon_y@users.sourceforge.net> * wincon.h(ENABLE_INSERT_MODE): Define.
diff --git a/mingw-w64-headers/include/basetyps.h b/mingw-w64-headers/include/basetyps.h index 0f4c0dd..604232d 100644 --- a/mingw-w64-headers/include/basetyps.h +++ b/mingw-w64-headers/include/basetyps.h
@@ -46,6 +46,7 @@ #define THIS void #define DECLARE_INTERFACE(iface) __STRUCT__ iface #define DECLARE_INTERFACE_(iface,baseiface) __STRUCT__ iface : public baseiface +#define DECLARE_INTERFACE_IID_(iface,baseiface,iidiface) __STRUCT__ iface : public baseiface #else @@ -74,6 +75,7 @@ struct iface##Vtbl #endif #define DECLARE_INTERFACE_(iface,baseiface) DECLARE_INTERFACE(iface) +#define DECLARE_INTERFACE_IID_(iface,baseiface,iidiface) DECLARE_INTERFACE(iface) #endif #include <guiddef.h>
diff --git a/mingw-w64-headers/include/objbase.h b/mingw-w64-headers/include/objbase.h index 2e21014..c739267 100644 --- a/mingw-w64-headers/include/objbase.h +++ b/mingw-w64-headers/include/objbase.h
@@ -30,6 +30,7 @@ #define THIS void #define DECLARE_INTERFACE(iface) __STRUCT__ iface #define DECLARE_INTERFACE_(iface,baseiface) __STRUCT__ iface : public baseiface +#define DECLARE_INTERFACE_IID_(iface,baseiface,iidiface) __STRUCT__ iface : public baseiface #if !defined(BEGIN_INTERFACE) #define BEGIN_INTERFACE @@ -64,6 +65,8 @@ #define DECLARE_INTERFACE(iface) typedef struct iface { struct iface##Vtbl *lpVtbl; } iface; typedef struct iface##Vtbl iface##Vtbl; struct iface##Vtbl #endif #define DECLARE_INTERFACE_(iface,baseiface) DECLARE_INTERFACE(iface) +#define DECLARE_INTERFACE_IID_(iface,baseiface,iidiface) DECLARE_INTERFACE(iface) + #endif #ifndef FARSTRUCT