From 81b956b6ad12732a042bb2fffeedeca024dd7393 Mon Sep 17 00:00:00 2001
From: Mathias Breiner <mathias.breiner@gameforge.com>
Date: Thu, 11 Feb 2016 19:31:26 +0100
Subject: [PATCH] Workaround for Resource Compiler warnings/errors under
 VS2010.

VS2010 RC.exe yielded lots of warnings and some errors when including some (unnecessary) platform header files via nssm.h. So now including only what is really required.
This includes a workaround for error RC2247 found here: http://stackoverflow.com/a/18317658
---
 nssm.h  |  11 +++++++++--
 nssm.rc | Bin 67090 -> 67140 bytes
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nssm.h b/nssm.h
index 911804f..f500a33 100644
--- a/nssm.h
+++ b/nssm.h
@@ -33,13 +33,19 @@
 #define DIR_LENGTH PATH_LENGTH - 12
 
 #define _WIN32_WINNT 0x0500
+
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include <windows.h>
+#include <prsht.h>
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include <commctrl.h>
+#include <tchar.h>
+#ifndef NSSM_COMPILE_RC
 #include <fcntl.h>
 #include <io.h>
 #include <shlwapi.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <tchar.h>
-#include <windows.h>
 #include "service.h"
 #include "account.h"
 #include "console.h"
@@ -53,6 +59,7 @@
 #include "settings.h"
 #include "io.h"
 #include "gui.h"
+#endif
 
 int str_equiv(const TCHAR *, const TCHAR *);
 void strip_basename(TCHAR *);
diff --git a/nssm.rc b/nssm.rc
index ee44017000699fb4c9030e615bfccbb2752fa3c3..7104cca5f9e846c65758b0d00208d5d830ad88bc 100644
GIT binary patch
delta 59
zcmbQ#!*ZmDWkQK|3PUPG8bc;S9*|aG@M8!DLSKe>24@C;ARWNq$>77_3gibdI5*~Q
J&1GE53IML14T%5%

delta 15
XcmX@o!!oIdWkN~gvaQP)=dl6+H|qwW

-- 
2.20.1