1 files changed, 13 insertions, 2 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 80411a97c25..3c53d2a5509 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -10,8 +10,19 @@
 
 #include <Ice/Functional.h>
 #include <Gen.h>
-#include <GenUtil.h>
-
+#include <GenUtil.h>
+#include <limits>
+
+//
+// Stupid Visual C++ defines min and max as macros :-(
+//
+#ifdef min
+#   undef min
+#endif
+#ifdef max
+#   undef max
+#endif
+
 using namespace std;
 using namespace Slice;