summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-05-14 09:55:34 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-05-14 12:58:57 +0200
commitfc3743c31bb3c84e31a2eff99e958337571eb5f0 (patch)
treec1f4176cd53c4e4f22f0a66ea7a1cf41202ed281
parenta5aa2bdf348391ee79bcbd9f43166f4a7dd4ed52 (diff)
downloadcurl-bagder/gcc8-cast-function-type.tar.gz
gcc: disable picky gcc-8 function pointer warnings in two placesbagder/gcc8-cast-function-type
Reported-by: Rikard Falkeborn Bug: #2560
-rw-r--r--lib/md5.c7
-rw-r--r--src/tool_metalink.c7
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/md5.c b/lib/md5.c
index 80301a141..3096602b7 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -484,6 +484,11 @@ static void MD5_Final(unsigned char *result, MD5_CTX *ctx)
#endif /* CRYPTO LIBS */
+/* Disable this picky gcc-8 compiler warning */
+#if defined(__GNUC__) && (__GNUC__ >= 8)
+#pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+
const HMAC_params Curl_HMAC_MD5[] = {
{
(HMAC_hinit_func) MD5_Init, /* Hash initialization function. */
diff --git a/src/tool_metalink.c b/src/tool_metalink.c
index 91c5878c9..03f159745 100644
--- a/src/tool_metalink.c
+++ b/src/tool_metalink.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -461,6 +461,11 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx)
#endif /* CRYPTO LIBS */
+/* Disable this picky gcc-8 compiler warning */
+#if defined(__GNUC__) && (__GNUC__ >= 8)
+#pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+
const digest_params MD5_DIGEST_PARAMS[] = {
{
(Curl_digest_init_func) MD5_Init,