From 8077ddaf62bdbff2169973eca565a5752501587d Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Fri, 19 Aug 2016 23:38:41 -0700
Subject: Updated to Diligent Engine 2.0

---
 RenderScript/include/ConvenienceFunctions.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'RenderScript/include/ConvenienceFunctions.h')

diff --git a/RenderScript/include/ConvenienceFunctions.h b/RenderScript/include/ConvenienceFunctions.h
index 2a4df13..23a08f4 100644
--- a/RenderScript/include/ConvenienceFunctions.h
+++ b/RenderScript/include/ConvenienceFunctions.h
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -28,7 +28,9 @@
 #include "ScriptParser.h"
 #include "DataBlobImpl.h"
 #ifdef _WIN32
-#   define NOMINMAX
+#   ifndef NOMINMAX
+#       define NOMINMAX
+#   endif
 #   include <Windows.h>
 #endif
 
@@ -39,7 +41,7 @@ Diligent::RefCntAutoPtr<Diligent::ScriptParser> CreateRenderScriptFromFile( cons
 {
     bool bSuccess = true;
     Diligent::RefCntAutoPtr<Diligent::ScriptParser> pScriptParser;
-#ifdef PLATFORM_WINDOWS
+#ifdef PLATFORM_WIN32
     do
     {
 #endif
@@ -69,7 +71,7 @@ Diligent::RefCntAutoPtr<Diligent::ScriptParser> CreateRenderScriptFromFile( cons
             ErrorMsg = err.what();
         }
 
-#ifdef PLATFORM_WINDOWS
+#ifdef PLATFORM_WIN32
         if( !bSuccess )
         {
             if( IDRETRY != MessageBoxA( NULL, "Failed to parse the script. Retry?", "Lua parser error", MB_ICONERROR | MB_ABORTRETRYIGNORE ) )
-- 
cgit v1.2.3