[PATCH] include: Protect _SECURITY_ATTRIBUTES from being defined twice
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winbase.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index dc8aa081be4..3992c124393 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -232,6 +232,8 @@ typedef struct _OFSTRUCT #define MAX_COMPUTERNAME_LENGTH 15 +#ifndef _SECURITY_ATTRIBUTES_ +#define _SECURITY_ATTRIBUTES_ /* The security attributes structure */ typedef struct _SECURITY_ATTRIBUTES { @@ -239,6 +241,7 @@ typedef struct _SECURITY_ATTRIBUTES LPVOID lpSecurityDescriptor; BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#endif #ifndef _FILETIME_ #define _FILETIME_ -- 2.29.2
On 1/17/21 3:46 PM, Alistair Leslie-Hughes wrote:
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winbase.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/winbase.h b/include/winbase.h index dc8aa081be4..3992c124393 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -232,6 +232,8 @@ typedef struct _OFSTRUCT
#define MAX_COMPUTERNAME_LENGTH 15
+#ifndef _SECURITY_ATTRIBUTES_ +#define _SECURITY_ATTRIBUTES_ /* The security attributes structure */ typedef struct _SECURITY_ATTRIBUTES { @@ -239,6 +241,7 @@ typedef struct _SECURITY_ATTRIBUTES LPVOID lpSecurityDescriptor; BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#endif
#ifndef _FILETIME_ #define _FILETIME_
How can this be defined twice? As far as I can see, it's defined in winbase.h and wtypes.idl, but the latter only defines it for the IDL compiler.
On 18/1/21 9:17 am, Zebediah Figura (she/her) wrote:
How can this be defined twice? As far as I can see, it's defined in winbase.h and wtypes.idl, but the latter only defines it for the IDL compiler.
I was compiling something locally which already had this defined. The windows headers actually protect this structure in the same way. Regards Alistair.
On 1/17/21 6:20 PM, Alistair Leslie-Hughes wrote:
On 18/1/21 9:17 am, Zebediah Figura (she/her) wrote:
How can this be defined twice? As far as I can see, it's defined in winbase.h and wtypes.idl, but the latter only defines it for the IDL compiler.
I was compiling something locally which already had this defined. The windows headers actually protect this structure in the same way.
I see protection in wtypes.idl, but not in winbase.h. That's with a Windows 10 SDK, though I don't know what version...
Regards Alistair.
On 18/1/21 11:29 am, Zebediah Figura (she/her) wrote:
On 1/17/21 6:20 PM, Alistair Leslie-Hughes wrote:
On 18/1/21 9:17 am, Zebediah Figura (she/her) wrote:
How can this be defined twice? As far as I can see, it's defined in winbase.h and wtypes.idl, but the latter only defines it for the IDL compiler.
I was compiling something locally which already had this defined. The windows headers actually protect this structure in the same way.
I see protection in wtypes.idl, but not in winbase.h. That's with a Windows 10 SDK, though I don't know what version...
In SDK 10.0.17763.0, WTypesbase.Idl has it protected and it's not defined in winbase.h. Defined minwinbase.h and not protected.
On 1/17/21 6:38 PM, Alistair Leslie-Hughes wrote:
On 18/1/21 11:29 am, Zebediah Figura (she/her) wrote:
On 1/17/21 6:20 PM, Alistair Leslie-Hughes wrote:
On 18/1/21 9:17 am, Zebediah Figura (she/her) wrote:
How can this be defined twice? As far as I can see, it's defined in winbase.h and wtypes.idl, but the latter only defines it for the IDL compiler.
I was compiling something locally which already had this defined. The windows headers actually protect this structure in the same way.
I see protection in wtypes.idl, but not in winbase.h. That's with a Windows 10 SDK, though I don't know what version...
In SDK 10.0.17763.0, WTypesbase.Idl has it protected and it's not defined in winbase.h. Defined minwinbase.h and not protected.
Right, that matches what I see.
participants (2)
-
Alistair Leslie-Hughes -
Zebediah Figura (she/her)