From 2922f0c7796fdf4ea1fe21eb2f55d9ad18fd1824 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 12 Feb 2013 18:22:14 +0200
Subject: Avoid defining min/max macros when including <winsock2.h>

---
 odb/mysql/mysql.hxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/odb/mysql/mysql.hxx b/odb/mysql/mysql.hxx
index 1773433..f4286b9 100644
--- a/odb/mysql/mysql.hxx
+++ b/odb/mysql/mysql.hxx
@@ -10,7 +10,13 @@
 #include <odb/mysql/mysql-types.hxx>
 
 #ifdef _WIN32
-#  include <winsock2.h>
+#  ifndef NOMINMAX // No min and max macros.
+#    define NOMINMAX
+#    include <winsock2.h>
+#    undef NOMINMAX
+#  else
+#    include <winsock2.h>
+#  endif
 #endif
 
 #ifdef LIBODB_MYSQL_INCLUDE_SHORT
-- 
cgit v1.1