+ try to fix problems with the "max" macro and windows

14 years ago · 4dd9c3b306
parent 641177ae0e
commit 4dd9c3b306
2 changed files with 14 additions and 0 deletions
--- a/src/zimlib/include/zim/cache.h
+++ b/src/zimlib/include/zim/cache.h
@ -24,6 +24,13 @@
 #include <limits>
 #include <iostream>

+#ifdef _WIN32
+#define NOMINMAX
+#  include <windows.h>
+#undef NOMINMAX
+#undef max
+#endif
+
 namespace zim
 {
  /**
--- a/src/zimlib/include/zim/fileheader.h
+++ b/src/zimlib/include/zim/fileheader.h
@ -26,6 +26,13 @@
 #include <iosfwd>
 #include <limits>

+#ifdef _WIN32
+#define NOMINMAX
+#  include <windows.h>
+#undef NOMINMAX
+#undef max
+#endif
+
 namespace zim
 {
  class Fileheader