From 07ea5261c4a0c88fccdf8b51b78a3d5b17a42702 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Fri, 10 Oct 2014 23:37:21 +0200
Subject: [PATCH] CheckStructHasMember: avoid breakage on -Wall

With CMAKE_C_FLAGS='-Wall -Werror', this test breaks due to
-Werror=unused-value. Fix this by ignoring the return value.
---
 Modules/CheckStructHasMember.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/CheckStructHasMember.cmake b/Modules/CheckStructHasMember.cmake
index 880a688..c8949cf 100644
--- a/Modules/CheckStructHasMember.cmake
+++ b/Modules/CheckStructHasMember.cmake
@@ -70,7 +70,7 @@ ${_INCLUDE_FILES}
 int main()
 {
    ${_STRUCT}* tmp;
-   tmp->${_MEMBER};
+   (void) tmp->${_MEMBER};
    return 0;
 }
 ")
-- 
1.9.1

From 18d0ad43480b38479d1c405a80ed71ed810a4f7a Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Thu, 30 Oct 2014 18:49:09 +0100
Subject: [PATCH] CheckStructHasMember: avoid clang -Wall breakage

With CMAKE_C_COMPILER=clang and CMAKE_C_FLAGS='-Wall -Werror', this test breaks
with -Werror,-Wuninitialized. Fix this by getting rid of the temporary variable.

Note: if this program needs to be run, use sizeof(..) to avoid
-fsantize=undefined failure.
---
 Modules/CheckStructHasMember.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Modules/CheckStructHasMember.cmake b/Modules/CheckStructHasMember.cmake
index c8949cf..de31d2c 100644
--- a/Modules/CheckStructHasMember.cmake
+++ b/Modules/CheckStructHasMember.cmake
@@ -69,8 +69,7 @@ macro (CHECK_STRUCT_HAS_MEMBER _STRUCT _MEMBER _HEADER _RESULT)
 ${_INCLUDE_FILES}
 int main()
 {
-   ${_STRUCT}* tmp;
-   (void) tmp->${_MEMBER};
+   (void)((${_STRUCT} *)0)->${_MEMBER};
    return 0;
 }
 ")
-- 
1.9.1

From 31484102de9d827a1a46183c1ce9407029c88d79 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Mon, 16 Feb 2015 00:22:10 +0100
Subject: [PATCH] CheckStructHasMember: fix null deref warning

Clang Static Analyzer is so smart that it reports a defect when this
intended null-deref is encountered. Fix the report by a different
approach to detecting a struct member.
---
 Modules/CheckStructHasMember.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Modules/CheckStructHasMember.cmake b/Modules/CheckStructHasMember.cmake
index de31d2c..b119e33 100644
--- a/Modules/CheckStructHasMember.cmake
+++ b/Modules/CheckStructHasMember.cmake
@@ -69,8 +69,9 @@ macro (CHECK_STRUCT_HAS_MEMBER _STRUCT _MEMBER _HEADER _RESULT)
 ${_INCLUDE_FILES}
 int main()
 {
-   (void)((${_STRUCT} *)0)->${_MEMBER};
-   return 0;
+   ${_STRUCT} tmp;
+   void *ptr = &tmp.${_MEMBER};
+   return !ptr;
 }
 ")
 
-- 
1.9.1