summaryrefslogtreecommitdiff
path: root/cppunit/makefile.mk
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-01-11 17:39:05 +0100
committersb <sb@openoffice.org>2010-01-11 17:39:05 +0100
commitcd55f83c52e8e1de1d954998e83adc31b706c08b (patch)
tree52285506bbda0ddcfaf1e18cc3791f41608b6f4f /cppunit/makefile.mk
parent98a252a675350643a3a0890fc8bbb5b8239892be (diff)
sb118: work around problem that <windows.h> defines OPTIONAL (clashing e.g. with com::sun::star::beans::PropertyAttribute::OPTIONAL)
Diffstat (limited to 'cppunit/makefile.mk')
-rw-r--r--cppunit/makefile.mk2
1 files changed, 1 insertions, 1 deletions
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&