cmocka: Avoid insane build layout, no functional change.


(jperkin)

$NetBSD: patch-include_cmocka.h,v 1.1 2018/02/02 10:31:07 jperkin Exp $

C99 fix.

--- include/cmocka.h.orig	2015-03-25 16:04:39.000000000 +0000
+++ include/cmocka.h
@@ -100,6 +100,11 @@ typedef uintmax_t LargestIntegralType;
     ((LargestIntegralType)(value))
 
 /* Smallest integral type capable of holding a pointer. */
+#if (__STDC_VERSION__ - 0 >= 199901L) && !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
+# include <stdint.h>
+# define _UINTPTR_T
+# define _UINTPTR_T_DEFINED
+#endif
 #if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
 # if defined(_WIN32)
     /* WIN32 is an ILP32 platform */

$NetBSD: patch-src_cmocka.c,v 1.1 2018/02/02 10:31:07 jperkin Exp $

C99 fix.

--- src/cmocka.c.orig	2015-06-08 12:54:44.000000000 +0000
+++ src/cmocka.c
@@ -960,7 +960,7 @@ static int memory_equal_display_error(co
     }
     if (differences) {
         cm_print_error("%d bytes of %p and %p differ\n", differences,
-                    a, b);
+                    (const void *)a, (const void *)b);
         return 0;
     }
     return 1;
@@ -985,7 +985,7 @@ static int memory_not_equal_display_erro
     }
     if (same == size) {
         cm_print_error("%"PRIdS "bytes of %p and %p the same\n", same,
-                    a, b);
+                    (const void *)a, (const void *)b);
         return 0;
     }
     return 1;
@@ -1646,7 +1646,7 @@ void _test_free(void* const ptr, const c
                                    file, line,
                                    ptr, (unsigned long)block_info->size,
                                    block_info->location.file, block_info->location.line,
-                                   &guard[j]);
+                                   (const void *)&guard[j]);
                     _fail(file, line);
                 }
             }