From d92d531ac0b7e12ab93df866f03de1decb075007 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 18 Sep 2014 23:46:57 -0700 Subject: [PATCH] Visual Studio: use #pragma warning(push/pop) instead of warning(default: ...) --- src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c b/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c index 946747d487..2b44469914 100644 --- a/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c +++ b/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c @@ -67,9 +67,10 @@ sodium_hrtime(void) #ifdef _WIN32 struct _timeb tb; +# pragma warning(push) # pragma warning(disable: 4996) _ftime(&tb); -# pragma warning(default: 4996) +# pragma warning(pop) tv.tv_sec = (long) tb.time; tv.tv_usec = ((int) tb.millitm) * 1000; ret = 0;