strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sb118: work around problem that <windows.h> defines OPTIONAL (clashing e.g. with com::sun:⭐🫘:PropertyAttribute::OPTIONAL)

Browse source
This commit is contained in:
sb 2010-01-11 17:39:05 +01:00
parent 98a252a675
commit cd55f83c52
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cppunit/makefile.mk
View file

@ -37,7 +37,7 @@ TARFILE_NAME = cppunit-1.12.1
# from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
# cppunit-1.12.1.tar.gz/download> # 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& # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912590&group_id=11795&atid=311795> # aid=2912590&group_id=11795&atid=311795>
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail& # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&

12
cppunit/windows.patch Normal file
View file

@ -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 ) \