From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 7 Jun 2012 20:17:16 +0000 (+0200)
Subject: simplified check for win32
X-Git-Tag: gnutls_3_0_21~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=088f9d305b8df030e0c005eff4f9576404ff8535;p=thirdparty%2Fgnutls.git

simplified check for win32
---

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 407568cca9..96656d2472 100644
--- 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 bc4d7311d1..c65be7a5c2 100644
--- 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);