sal/qa/osl/file/osl_File.cxx | 4 ++++
svtools/Library_svt.mk | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 3af1efde386531c7f0c6c0f66e142c9c19da9e47
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 21 15:49:38 2011 +0000
build-fix for windows msvc
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 84bc1bd..5f0cfc6 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_set_include,svt,\
))
$(eval $(call gb_Library_add_defs,svt,\
- -DSVT_DLLIMPLEMENTATION \
+ -DSVT_DLLIMPLEMENTATION -DNOMINMAX\
))
$(eval $(call gb_Library_add_linked_libs,svt,\
commit b40f2b9b08e0b66101f65058f56093610052d5b8
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 21 15:48:00 2011 +0000
get osl_File qa test to build under windows
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index aa6e835..bb1939c 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -52,6 +52,10 @@
#include <boost/scoped_ptr.hpp>
+#ifdef WNT
+#include <windows.h>
+#endif
+
using namespace osl;
using ::rtl::OUString;
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
