diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-05-27 21:13:43 +0000 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-05-27 21:13:43 +0000 |
| commit | c670e8301145c1fe475b93df06edc50f69a760f8 (patch) | |
| tree | ce9f71707c4237a02d1b841571cfd90bf2b44091 /lib/system/keys-win.c | |
| parent | dca9dcdecd448b75ccae83b99f6a18b607ff694f (diff) | |
| parent | e0fa7550c0458a95ea5ca011e1d8c405c18b0f1d (diff) | |
| download | gnutls-c670e8301145c1fe475b93df06edc50f69a760f8.tar.gz | |
Merge branch 'static-ncrypt' into 'master'
Allow statically linking ncrypt (win32)
See merge request gnutls/gnutls!1254
Diffstat (limited to 'lib/system/keys-win.c')
| -rw-r--r-- | lib/system/keys-win.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/system/keys-win.c b/lib/system/keys-win.c index 678a668e49..767e377040 100644 --- a/lib/system/keys-win.c +++ b/lib/system/keys-win.c @@ -26,6 +26,7 @@ #define _WIN32_WINNT 0x600 #endif +#include <config.h> #include "gnutls_int.h" #include "errors.h" #include <gnutls/gnutls.h> @@ -45,8 +46,6 @@ #include <winbase.h> #include <winapifamily.h> -#define DYN_NCRYPT - #ifdef __MINGW32__ # include <_mingw.h> # ifdef __MINGW64_VERSION_MAJOR @@ -1487,13 +1486,16 @@ int _gnutls_system_key_init(void) ret = GNUTLS_E_CRYPTO_INIT_FAILED; goto fail; } -#endif ncrypt_init = 1; return 0; fail: FreeLibrary(ncrypt_lib); return ret; +#else + ncrypt_init = 1; + return 0; +#endif } void _gnutls_system_key_deinit(void) |