include: Avoid redefinition warnings when basetyps.h is used together with winnt.h or objbase.h.

include/basetyps.h

@@ -26,18 +26,26 @@
 # define EXTERN_C extern
 #endif
 
-#define STDMETHODCALLTYPE  WINAPI
-#define STDMETHODVCALLTYPE WINAPIV
-#define STDAPICALLTYPE     WINAPI
-#define STDAPIVCALLTYPE    WINAPIV
-#define STDAPI             EXTERN_C HRESULT STDAPICALLTYPE
-#define STDAPI_(t)         EXTERN_C t STDAPICALLTYPE
-#define STDMETHODIMP       HRESULT STDMETHODCALLTYPE
-#define STDMETHODIMP_(t)   t STDMETHODCALLTYPE
-#define STDAPIV            EXTERN_C HRESULT STDAPIVCALLTYPE
-#define STDAPIV_(t)        EXTERN_C t STDAPIVCALLTYPE
-#define STDMETHODIMPV      HRESULT STDMETHODVCALLTYPE
-#define STDMETHODIMPV_(t)  t STDMETHODVCALLTYPE
+#define STDMETHODCALLTYPE     WINAPI
+#define STDMETHODVCALLTYPE    WINAPIV
+#define STDAPICALLTYPE        WINAPI
+#define STDAPIVCALLTYPE       WINAPIV
+#define STDAPI                EXTERN_C HRESULT STDAPICALLTYPE
+#define STDAPI_(type)         EXTERN_C type STDAPICALLTYPE
+#define STDMETHODIMP          HRESULT STDMETHODCALLTYPE
+#define STDMETHODIMP_(type)   type STDMETHODCALLTYPE
+#define STDAPIV               EXTERN_C HRESULT STDAPIVCALLTYPE
+#define STDAPIV_(type)        EXTERN_C type STDAPIVCALLTYPE
+#define STDMETHODIMPV         HRESULT STDMETHODVCALLTYPE
+#define STDMETHODIMPV_(type)  type STDMETHODVCALLTYPE
+
+#undef STDMETHOD
+#undef STDMETHOD_
+#undef PURE
+#undef THIS_
+#undef THIS
+#undef DECLARE_INTERFACE
+#undef DECLARE_INTERFACE_
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
 

include/objbase.h

@@ -170,6 +170,14 @@
  *    macro is defined in which case we would not be here.
  */
 
+#undef STDMETHOD
+#undef STDMETHOD_
+#undef PURE
+#undef THIS_
+#undef THIS
+#undef DECLARE_INTERFACE
+#undef DECLARE_INTERFACE_
+
 #if defined(__cplusplus) && !defined(CINTERFACE)
 
 #ifdef COM_STDMETHOD_CAN_THROW