diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 6769fbca..3cbb376e 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -228,6 +228,3 @@ endif SUBDIRS = \ include - -EXTRA_DIST = \ - quirks/windows/stdbool.h diff --git a/src/libsodium/quirks/windows/stdbool.h b/src/libsodium/quirks/windows/stdbool.h deleted file mode 100644 index 86e5b7ba..00000000 --- a/src/libsodium/quirks/windows/stdbool.h +++ /dev/null @@ -1,18 +0,0 @@ - -#ifndef __STDBOOL_H__ -#define __STDBOOL_H__ - -#if defined(__cplusplus) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L -typedef signed char _Bool; -# undef bool -# define bool _Bool - -# ifndef __bool_true_false_are_defined -# undef false -# define false 0 -# undef true -# define true 1 -# endif -#endif - -#endif diff --git a/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c b/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c index 71a69fc1..30f57a9b 100644 --- a/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c +++ b/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -46,7 +45,7 @@ typedef struct Salsa20Random_ { HCRYPTPROV hcrypt_prov; #endif int random_data_source_fd; - bool initialized; + int initialized; } Salsa20Random; static Salsa20Random stream = { diff --git a/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c b/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c index b8ecd72e..35a3bcd5 100644 --- a/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c +++ b/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -31,7 +30,7 @@ typedef struct SysRandom_ { HCRYPTPROV hcrypt_prov; #endif int random_data_source_fd; - bool initialized; + int initialized; } SysRandom; static SysRandom stream = { diff --git a/src/libsodium/sodium/core.c b/src/libsodium/sodium/core.c index 654b1ec8..9ab858b3 100644 --- a/src/libsodium/sodium/core.c +++ b/src/libsodium/sodium/core.c @@ -1,11 +1,9 @@ -#include - #include "core.h" #include "crypto_onetimeauth.h" #include "randombytes.h" -static bool initialized; +static int initialized; int sodium_init(void)