--- ./third_party/cmocka/cmocka.h.orig 2024-03-26 10:23:03.378410042 +0100 +++ ./third_party/cmocka/cmocka.h 2024-03-26 10:24:51.526922405 +0100 @@ -14,6 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifndef CMOCKA_H_ #define CMOCKA_H_ @@ -111,7 +114,7 @@ ((LargestIntegralType)(value)) /* Smallest integral type capable of holding a pointer. */ -#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) +#if !defined(HAVE_UINTPTR_T) && !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t) # if defined(_WIN32) /* WIN32 is an ILP32 platform */ typedef unsigned int uintptr_t;