# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1342730392 -7200
# Node ID 9d483cf71d17c55746cd2f5f16de585a5ef28c1f
# Parent  01163b17a0281c763225c4a8d05db4fef924fe2f
fix warnings

diff -r 01163b17a028 -r 9d483cf71d17 PalantirServer/DicomIntegerPixelAccessor.cpp
--- a/PalantirServer/DicomIntegerPixelAccessor.cpp	Thu Jul 19 22:38:30 2012 +0200
+++ b/PalantirServer/DicomIntegerPixelAccessor.cpp	Thu Jul 19 22:39:52 2012 +0200
@@ -20,7 +20,10 @@
 
 #include "DicomIntegerPixelAccessor.h"
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
+
 #include "../Core/PalantirException.h"
 #include "FromDcmtkBridge.h"
 #include <boost/lexical_cast.hpp>
diff -r 01163b17a028 -r 9d483cf71d17 PalantirServer/ServerIndex.cpp
--- a/PalantirServer/ServerIndex.cpp	Thu Jul 19 22:38:30 2012 +0200
+++ b/PalantirServer/ServerIndex.cpp	Thu Jul 19 22:39:52 2012 +0200
@@ -22,7 +22,10 @@
 
 using namespace Palantir;
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
+
 #include <EmbeddedResources.h>
 #include "../Core/Toolbox.h"
 #include "../Core/Uuid.h"