diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-18 16:52:55 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-18 17:14:38 +0100 |
| commit | 92a3408646c5932a29e1a658f50283891c1de2b6 (patch) | |
| tree | ca37bb327f4d1f15ccd3b8bedbaedfa1b0ddb2e8 /cppunit | |
| parent | 22771babcc47b294d528d56cec360e2a94daec26 (diff) | |
fix Wundef in cppunit
Change-Id: Ide5f9d36cf7e5e8cd3442a1b5f098a85cb8d6de0
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/UnpackedTarball_cppunit.mk | 1 | ||||
| -rw-r--r-- | cppunit/wundef.patch | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/cppunit/UnpackedTarball_cppunit.mk b/cppunit/UnpackedTarball_cppunit.mk index c8cb69eafc09..733a30228b93 100644 --- a/cppunit/UnpackedTarball_cppunit.mk +++ b/cppunit/UnpackedTarball_cppunit.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ cppunit/windows.patch \ cppunit/unix.patch \ + cppunit/wundef.patch \ )) ifeq ($(OS),ANDROID) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ diff --git a/cppunit/wundef.patch b/cppunit/wundef.patch new file mode 100644 index 000000000000..5f701cd702d1 --- /dev/null +++ b/cppunit/wundef.patch @@ -0,0 +1,12 @@ +--- misc/cppunit-1.13.1/include/cppunit/Portability.h 2012-09-24 19:10:36.000000000 +0200 ++++ misc/build/cppunit-1.13.1/include/cppunit/Portability.h 2013-03-18 14:23:48.880718714 +0100 +@@ -68,6 +68,9 @@ + * std::allocator. On some compilers, you may need to change this to + * std::allocator<T>. + */ ++#ifndef CPPUNIT_STD_NEED_ALLOCATOR /* avoid -Wundef warning */ ++#define CPPUNIT_STD_NEED_ALLOCATOR 0 ++#endif + #if CPPUNIT_STD_NEED_ALLOCATOR + # if !defined(CPPUNIT_STD_ALLOCATOR) + # define CPPUNIT_STD_ALLOCATOR std::allocator |