summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2012-02-19 23:40:53 +0100
committerChristophe Fergeau <cfergeau@redhat.com>2012-02-23 19:03:26 +0100
commit9a19829697c44598a0ced93b513ec04bb8fc6e80 (patch)
tree9648efa5a99e8307050496bde3eab2b7414bae6b
parent3eb86e01b9c15378ade2c8f0a6e9988867090dbe (diff)
mingw: workaround ximage.h #defining min/max
This confuses the deque implementation of gcc which uses std::min std::max and causes compile failure.
-rw-r--r--vdagent/vdagent.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/vdagent/vdagent.cpp b/vdagent/vdagent.cpp
index 06c701d..a288861 100644
--- a/vdagent/vdagent.cpp
+++ b/vdagent/vdagent.cpp
@@ -19,6 +19,8 @@
#include "desktop_layout.h"
#include "display_setting.h"
#include "ximage.h"
+#undef max
+#undef min
#include <lmcons.h>
#include <queue>
#include <set>