File cmocka-1.0.0-fix_build_with_newer_gcc.patch of Package cmocka

Overview Repositories Revisions Requests Users Attributes Meta

File cmocka-1.0.0-fix_build_with_newer_gcc.patch of Package cmocka

From ab0f3769a08de746e0aed60665dfa2638ae3e61d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 20 Feb 2015 09:47:44 +0100
Subject: [PATCH 1/2] include: Fix building with newer gcc versions.

__func__ is not a macro. We just need to define it on Windows for now.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
---
 include/cmocka.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/cmocka.h b/include/cmocka.h
index 303d0ae..43336e8 100644
--- a/include/cmocka.h
+++ b/include/cmocka.h
@@ -19,6 +19,8 @@
 #ifdef _WIN32
 # ifdef _MSC_VER
 
+#define __func__ __FUNCTION__
+
 # ifndef inline
 #define inline __inline
 # endif /* inline */
@@ -52,11 +54,6 @@ int __stdcall IsDebuggerPresent();
  * @{
  */
 
-/* For those who are used to __func__ from gcc. */
-#ifndef __func__
-#define __func__ __FUNCTION__
-#endif
-
 /* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */
 #ifndef __WORDSIZE
 # if defined(__x86_64__) && !defined(__ILP32__)
-- 
2.1.0

Places

File cmocka-1.0.0-fix_build_with_newer_gcc.patch of Package cmocka

Places