simplified check for win32

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 407568cca92c7f0f48b9456e8a8411511eb4d830..96656d24722d7e2c983527c73f1e1f32d90ba8db 100644 (file)
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -42,8 +42,8 @@
 #include "x509/x509_int.h"
 #include <gnutls_str_array.h>
 #include "read-file.h"
-#if defined _WIN32 || defined __WIN32__
-#include <wincrypt.h>
+#ifdef _WIN32
+# include <wincrypt.h>
 #endif
 
 /*

diff --git a/src/cli.c b/src/cli.c
index bc4d7311d1f714a4665a0898731c1f8776ee8131..c65be7a5c2ca83e22639932e19ecdabc85a08b39 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -965,7 +965,7 @@ after_handshake:
   fflush (stderr);
 
   /* do not buffer */
-#if !(defined _WIN32 || defined __WIN32__)
+#ifndef _WIN32
   setbuf (stdin, NULL);
 #endif
   setbuf (stdout, NULL);