summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Neeraj Singh <neerajsi@microsoft.com>2022-03-10 22:43:19 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-10 15:10:22 -0800
commit19d3f228c8df7e946278c96fb52acf1cea0f6a7a (patch)
tree2a4ff4edc2d7862dcd7c363f82adaf1e1bc3fc76 /ll-merge.h
parentThe ninth batch (diff)
downloadtgif-19d3f228c8df7e946278c96fb52acf1cea0f6a7a.tar.xz
wrapper: make inclusion of Windows csprng header tightly scoped
Including NTSecAPI.h in git-compat-util.h causes build errors in any other file that includes winternl.h. NTSecAPI.h was included in order to get access to the RtlGenRandom cryptographically secure PRNG. This change scopes the inclusion of ntsecapi.h to wrapper.c, which is the only place that it's actually needed. The build breakage is due to the definition of UNICODE_STRING in NtSecApi.h: #ifndef _NTDEF_ typedef LSA_UNICODE_STRING UNICODE_STRING, *PUNICODE_STRING; typedef LSA_STRING STRING, *PSTRING ; #endif LsaLookup.h: typedef struct _LSA_UNICODE_STRING { USHORT Length; USHORT MaximumLength; #ifdef MIDL_PASS [size_is(MaximumLength/2), length_is(Length/2)] #endif // MIDL_PASS PWSTR Buffer; } LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; winternl.h also defines UNICODE_STRING: typedef struct _UNICODE_STRING { USHORT Length; USHORT MaximumLength; PWSTR Buffer; } UNICODE_STRING; typedef UNICODE_STRING *PUNICODE_STRING; Both definitions have equivalent layouts. Apparently these internal Windows headers aren't designed to be included together. This is an oversight in the headers and does not represent an incompatibility between the APIs. Signed-off-by: Neeraj Singh <neerajsi@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions