add windows patch back
Change-Id: Id30b06eb093e373da6eb328b5d22788f308ae4ff
This commit is contained in:
parent
5e67fb190b
commit
2414bb8d9e
2 changed files with 49 additions and 1 deletions
|
@ -32,7 +32,7 @@ TARGET = cppunit
|
|||
TARFILE_NAME=cppunit-1.13.0
|
||||
TARFILE_MD5=0c65c839854edd43d9294d1431a2b292
|
||||
|
||||
PATCH_FILES =
|
||||
PATCH_FILES = windows.patch
|
||||
|
||||
.IF "$(OS)" == "ANDROID"
|
||||
PATCH_FILES += android.patch
|
||||
|
|
48
cppunit/windows.patch
Normal file
48
cppunit/windows.patch
Normal file
|
@ -0,0 +1,48 @@
|
|||
--- misc/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:25.084658287 +0100
|
||||
+++ misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:18.660706180 +0100
|
||||
@@ -133,9 +133,8 @@
|
||||
/*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
|
||||
* \brief Implements the 'main' function for the plug-in.
|
||||
*
|
||||
- * This macros implements the main() function for dynamic library.
|
||||
- * For example, WIN32 requires a DllMain function, while some Unix
|
||||
- * requires a main() function. This macros takes care of the implementation.
|
||||
+ * This macro implements the main() function for dynamic library
|
||||
+ * on Unix for some weird reason.
|
||||
*/
|
||||
|
||||
// Win32
|
||||
@@ -149,21 +149,7 @@
|
||||
|
||||
// Win32
|
||||
#if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER)
|
||||
-#if !defined(APIENTRY)
|
||||
-#define WIN32_LEAN_AND_MEAN
|
||||
-#define NOGDI
|
||||
-#define NOUSER
|
||||
-#define NOKERNEL
|
||||
-#define NOSOUND
|
||||
-#define NOMINMAX
|
||||
-#define BLENDFUNCTION void // for mingw & gcc
|
||||
-#include <windows.h>
|
||||
-#endif
|
||||
#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
|
||||
- BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \
|
||||
- { \
|
||||
- return TRUE; \
|
||||
- } \
|
||||
typedef char __CppUnitPlugInImplementMainDummyTypeDef
|
||||
|
||||
// Unix
|
||||
--- misc/cppunit-1.13.0/include/cppunit/TestAssert.h
|
||||
+++ misc/build/cppunit-1.13.0/include/cppunit/TestAssert.h
|
||||
@@ -76,7 +76,7 @@
|
||||
const int precision = 15;
|
||||
#endif // #ifdef DBL_DIG
|
||||
char buffer[128];
|
||||
-#ifdef __STDC_SECURE_LIB__ // Use secure version with visual studio 2005 to avoid warning.
|
||||
+#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning.
|
||||
sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x);
|
||||
#else
|
||||
sprintf(buffer, "%.*g", precision, x);
|
||||
|
Loading…
Reference in a new issue