diff --git a/glib/gwin32.h b/glib/gwin32.h index 182d23fcd..5397ef6b4 100644 --- a/glib/gwin32.h +++ b/glib/gwin32.h @@ -43,11 +43,6 @@ G_BEGIN_DECLS #ifdef G_OS_WIN32 -/* needed include for C++ builds; including this in C mode will cause havoc of type conflicts */ -#ifdef __cplusplus -#include -#endif - /* * To get prototypes for the following POSIXish functions, you have to * include the indicated non-POSIX headers. The functions are defined @@ -184,12 +179,10 @@ template static inline void g_win32_clear_com (com_interface **com_obj) { - IUnknown **unknown_com_obj = reinterpret_cast(com_obj); - - if (*unknown_com_obj != NULL) + if (*com_obj != NULL) { - (*unknown_com_obj)->Release (); - *unknown_com_obj = NULL; + (*com_obj)->Release (); + *com_obj = NULL; } } #endif