diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-02-12 03:55:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-02-12 03:55:57 +0300 |
commit | d073bdc6a06f26b81457abed653c8fb9cee4ba0c (patch) | |
tree | e4454ca629f905969c4ea03c12eb7a8431953fa7 /compat | |
parent | 8db2f665e1b25c2e88ddb00b402a4aa3b73a4cf4 (diff) | |
parent | 47efda967cfd4ef9d39de149e1e3654b051e5d19 (diff) |
Merge branch 'bc/csprng-mktemps'
Pick a better random number generator and use it when we prepare
temporary filenames.
* bc/csprng-mktemps:
wrapper: use a CSPRNG to generate random file names
wrapper: add a helper to generate numbers from a CSPRNG
Diffstat (limited to 'compat')
-rw-r--r-- | compat/winansi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compat/winansi.c b/compat/winansi.c index 4fceecf14c..936a80a5f0 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -3,6 +3,12 @@ */ #undef NOGDI + +/* + * Including the appropriate header file for RtlGenRandom causes MSVC to see a + * redefinition of types in an incompatible way when including headers below. + */ +#undef HAVE_RTLGENRANDOM #include "../git-compat-util.h" #include <wingdi.h> #include <winreg.h> |