luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-26 09:30:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

gwin32.h: Avoid including unknwn.h

Browse Source 
It pulls in windows.h causing conflict for code that assume windows.h is not
previously included.

Thanks to Luca Bacci for proposing this fix, and @Osyotr for pointing
out this issue!

Fixes issue #3613.
This commit is contained in:
Chun-wei Fan 2025-02-19 20:34:19 +08:00
parent 67a2f8c593
commit d920a86e25
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glib/gwin32.h
View File

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