From cd55f83c52e8e1de1d954998e83adc31b706c08b Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Mon, 11 Jan 2010 17:39:05 +0100
Subject: [PATCH] sb118: work around problem that <windows.h> defines OPTIONAL
 (clashing e.g. with com::sun::star::beans::PropertyAttribute::OPTIONAL)

---
 cppunit/makefile.mk   |  2 +-
 cppunit/windows.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 cppunit/windows.patch

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 43cef0c4f606..040120da060e 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -37,7 +37,7 @@ TARFILE_NAME = cppunit-1.12.1
     # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
     #  cppunit-1.12.1.tar.gz/download>
 
-PATCH_FILES = solarisfinite.patch warnings.patch
+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch
     # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
     #  aid=2912590&group_id=11795&atid=311795>
     # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
diff --git a/cppunit/windows.patch b/cppunit/windows.patch
new file mode 100644
index 000000000000..da346924ea44
--- /dev/null
+++ b/cppunit/windows.patch
@@ -0,0 +1,12 @@
+--- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:25.084658287 +0100
++++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:18.660706180 +0100
+@@ -149,6 +149,9 @@
+ #define NOMINMAX
+ #define BLENDFUNCTION void    // for mingw & gcc
+ #include <windows.h>
++#if defined(OPTIONAL) // set within windows.h
++#undef OPTIONAL
++#endif
+ #endif
+ #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
+   BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID )      \