From e3aea550bec92bbb79e9ce5d6d0e1c357eff60b7 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Mon, 28 Oct 2013 10:31:07 +0100
Subject: "fix" some "unused parameter" warnings

(bzr r12738)
---
 src/winmain.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/winmain.cpp')

diff --git a/src/winmain.cpp b/src/winmain.cpp
index 752ab8e6b..607660740 100644
--- a/src/winmain.cpp
+++ b/src/winmain.cpp
@@ -25,10 +25,10 @@ extern int main (int argc, char **argv);
 #endif
 
 int _stdcall
-WinMain (struct HINSTANCE__ *hInstance,
-	 struct HINSTANCE__ *hPrevInstance,
-	 char               *lpszCmdLine,
-	 int                 nCmdShow)
+WinMain (struct HINSTANCE__ */*hInstance*/,
+	 struct HINSTANCE__ */*hPrevInstance*/,
+	 char               */*lpszCmdLine*/,
+	 int                 /*nCmdShow*/)
 {
     if (fileno (stdout) != -1 &&
  	  _get_osfhandle (fileno (stdout)) != -1)
-- 
cgit v1.2.3


From d8bca572c833841866ac4fd1cf1aef139a9b9fc0 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sun, 23 Mar 2014 18:35:36 +0100
Subject: fix Windows build for newer gcc/libs

(bzr r13190)
---
 src/winmain.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/winmain.cpp')

diff --git a/src/winmain.cpp b/src/winmain.cpp
index 607660740..5120e44e0 100644
--- a/src/winmain.cpp
+++ b/src/winmain.cpp
@@ -11,7 +11,12 @@
 #include <stdio.h>
 #include <io.h>
 #include <conio.h>
-#define _WIN32_WINNT 0x0501
+
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501)
+# undef _WIN32_WINNT 
+# define _WIN32_WINNT 0x0501
+#endif
+
 #include <windows.h>
 
 extern int main (int argc, char **argv);
-- 
cgit v1.2.3