summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2010-05-20 07:42:45 +0000
committerDRC <dcommander@users.sourceforge.net>2010-05-20 07:42:45 +0000
commitc2d87605543e09cad3269ffbafed17759f137ed4 (patch)
treeee847033cfd21581614697ef6e5a664a3acdcb2d /win
parent0a6080189652dd060b7660fc59630ef155e7cd4b (diff)
downloadtigervnc-c2d87605543e09cad3269ffbafed17759f137ed4.tar.gz
tigervnc-c2d87605543e09cad3269ffbafed17759f137ed4.zip
Some compilers (most notably, MinGW64) don't define min and max
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4060 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win')
-rw-r--r--win/rfb_win32/MonitorInfo.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/win/rfb_win32/MonitorInfo.cxx b/win/rfb_win32/MonitorInfo.cxx
index 03772e97..0a5e34fa 100644
--- a/win/rfb_win32/MonitorInfo.cxx
+++ b/win/rfb_win32/MonitorInfo.cxx
@@ -22,6 +22,14 @@
#include <rdr/Exception.h>
#include <rfb/LogWriter.h>
+#ifndef min
+ #define min(a,b) ((a)<(b)?(a):(b))
+#endif
+
+#ifndef max
+ #define max(a,b) ((a)>(b)?(a):(b))
+#endif
+
using namespace rfb;
using namespace win32;