From: Mathias Breiner <mathias.breiner@gameforge.com>
Date: Thu, 11 Feb 2016 18:31:26 +0000 (+0100)
Subject: Workaround for Resource Compiler warnings/errors under VS2010.
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=81b956b6ad12732a042bb2fffeedeca024dd7393;p=nssm.git

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
---

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 ee44017..7104cca 100644
Binary files a/nssm.rc and b/nssm.rc differ