From 89d059c3fcfdcac814c3d5705b2c03a220ac3f3f Mon Sep 17 00:00:00 2001
From: Oliver Schneider <oliver@assarbad.net>
Date: Wed, 15 Nov 2017 22:29:54 +0000
Subject: Fixing build issues

---
 premake4.lua                       | 3 +--
 public_release.cmd                 | 1 -
 windirstat/getosplatformstring.cpp | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/premake4.lua b/premake4.lua
index c3e295b..eaff18a 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -297,13 +297,12 @@ solution (iif(release, slnname, "windirstat"))
         resoptions      {"/nologo", "/l409"}
         resincludedirs  {".", "$(IntDir)"}
         linkoptions     {"/delayload:psapi.dll", "/pdbaltpath:%_PDB%"}
+        prebuildcommands{"if not exist \"$(SolutionDir)common\\hgid.h\" call \"$(SolutionDir)\\common\\hgid.cmd\"",}
         if release then
             postbuildcommands
             {
                 "ollisign.cmd -a \"$(TargetPath)\" \"https://windirstat.net\" \"WinDirStat\""
             }
-        else
-            prebuildcommands{"if not exist \"$(SolutionDir)common\\hgid.h\" call \"$(SolutionDir)\\common\\hgid.cmd\"",}
         end
         files
         {
diff --git a/public_release.cmd b/public_release.cmd
index b896f1c..834b4e9 100644
--- a/public_release.cmd
+++ b/public_release.cmd
@@ -3,7 +3,6 @@ setlocal ENABLEEXTENSIONS & pushd .
 call "%~dp0common\hgid.cmd"
 "%~dp0common\premake4.exe" --release --resources vs2005
 call %~dp0common\setvcvars.cmd 2005
-call %~dp0common\buildinc.cmd "%~dp0common"
 echo %VCVER_FRIENDLY%
 ::popd & endlocal & goto :EOF
 vcbuild.exe /time /rebuild /showenv /M1 /nologo ^
diff --git a/windirstat/getosplatformstring.cpp b/windirstat/getosplatformstring.cpp
index fbbeca6..3684cf3 100644
--- a/windirstat/getosplatformstring.cpp
+++ b/windirstat/getosplatformstring.cpp
@@ -27,6 +27,10 @@
 #define new DEBUG_NEW
 #endif
 
+#ifndef _Return_type_success_
+#   define _Return_type_success_(x)
+#endif
+
 namespace {
     typedef _Return_type_success_(return >= 0) LONG NTSTATUS;
     /*lint -save -e624 */  // Don't complain about different typedefs.
-- 
cgit v1.2.3