From 4dd9c3b3068fef920a2f3013ebfe831b0c995df5 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Tue, 7 Aug 2012 10:09:31 +0000 Subject: [PATCH] + try to fix problems with the "max" macro and windows --- src/zimlib/include/zim/cache.h | 7 +++++++ src/zimlib/include/zim/fileheader.h | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/zimlib/include/zim/cache.h b/src/zimlib/include/zim/cache.h index 51a889f..c0ea6a7 100644 --- a/src/zimlib/include/zim/cache.h +++ b/src/zimlib/include/zim/cache.h @@ -24,6 +24,13 @@ #include #include +#ifdef _WIN32 +#define NOMINMAX +# include +#undef NOMINMAX +#undef max +#endif + namespace zim { /** diff --git a/src/zimlib/include/zim/fileheader.h b/src/zimlib/include/zim/fileheader.h index a34ed72..46d7fc5 100644 --- a/src/zimlib/include/zim/fileheader.h +++ b/src/zimlib/include/zim/fileheader.h @@ -26,6 +26,13 @@ #include #include +#ifdef _WIN32 +#define NOMINMAX +# include +#undef NOMINMAX +#undef max +#endif + namespace zim { class Fileheader