Embarcadero 10.4 with OverByte - OverbyteIcsSspi - ambiguity error

[L-Leandro]

Hi,

I have been using Embarcadero 10.3 with OverByte and that has been working ok.
I recently upgraded to Embarcadero 10.4 with OverByte (also upgraded OverByte from https://github.com/fpiette/OverbyteICS) and some of my projects start to give me ambiguity error,

First I had to define SECURITY_WIN32 in my projects and after that I start to get the following error (in file sspi.h - that is located in C:\Program Files (x86)\Embarcadero\Studio\21.0\include\windows\sdk):

"[bcc32 Error] sspi.h(154): E2015 Ambiguity between 'PSecHandle' and 'Crsspi::PSecHandle'"
and
"[bcc32 Error] sspi.h(1523): E2015 Ambiguity between 'PSecBufferDesc' and 'Crsspi::PSecBufferDesc'"

After checking it properly, this happens in all projects that I use/include OverbyteIcsSspi.hpp.
To get around this (temporarily) I changed the sspi.h:
PSecHandle -> ::PSecHandle

But this is a standard file/class from Embarcadero, so is not the ideal solution. Any change we can do something for OverbyteIcsSspi.hpp and sspi.h don't give me a ambiguity?

Thanks!