Wednesday, 28 October 2015

[gccsdk] libgcrypt20 on gcc5


Again the __FUNCTION__ issue crops up

patch to fix ( into autobuilder.libraries/libgcrypt20):


--- src/g10lib.h    2015-09-07 13:05:57.000000000 +0100
+++ src/g10lib.h.fixed    2015-10-28 17:48:55.000000000 +0000
@@ -162,9 +162,9 @@
 int _gcry_log_verbosity( int level );
 
 #ifdef JNLIB_GCC_M_FUNCTION
-#define BUG() _gcry_bug( __FILE__ , __LINE__, __FUNCTION__ )
+#define BUG() _gcry_bug( __FILE__ , __LINE__, __func__ )
 #define gcry_assert(expr) ((expr)? (void)0 \
-         : _gcry_assert_failed (STR(expr), __FILE__, __LINE__, __FUNCTION__))
+         : _gcry_assert_failed (STR(expr), __FILE__, __LINE__, __func__))
 #elif __STDC_VERSION__ >= 199901L
 #define BUG() _gcry_bug( __FILE__ , __LINE__, __func__ )
 #define gcry_assert(expr) ((expr)? (void)0 \
@@ -404,9 +404,9 @@
                               const char *description);
 #ifdef JNLIB_GCC_M_FUNCTION
 # define fips_signal_error(a) \
-           _gcry_fips_signal_error (__FILE__, __LINE__, __FUNCTION__, 0, (a))
+           _gcry_fips_signal_error (__FILE__, __LINE__, __func__, 0, (a))
 # define fips_signal_fatal_error(a) \
-           _gcry_fips_signal_error (__FILE__, __LINE__, __FUNCTION__, 1, (a))
+           _gcry_fips_signal_error (__FILE__, __LINE__, __func__, 1, (a))
 #else
 # define fips_signal_error(a) \
            _gcry_fips_signal_error (__FILE__, __LINE__, NULL, 0, (a))


--
Stop press! Just announced -

Most Trusted Broadband Provider in the 2014 Moneywise Customer Services Awards

For full details of see https://www.utilitywarehouse.co.uk/reviews?exref=095761

Intrigued? Call me

John Ballance C.Eng MIET - jwb@macpcrepair.co.uk - 07976 295923

No comments:

Post a Comment