some tests fix

LouisBrunner · Oct 25, 2024 · 98a4211 · 98a4211
1 parent 845afb2
commit 98a4211
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/coregrind/m_replacemalloc/vg_replace_malloc.c b/coregrind/m_replacemalloc/vg_replace_malloc.c
@@ -313,7 +313,7 @@ extern int * __error(void) __attribute__((weak));
       return v; \
    }
 
-#if DARWIN_VERS >= DARWIN_15_00
+#if defined(VGO_darwin) && DARWIN_VERS >= DARWIN_15_00
 #define _DARWIN_C_SOURCE
 #include <malloc/malloc.h>
 #undef _DARWIN_C_SOURCE

diff --git a/memcheck/tests/wcpncpy.stderr.exp b/memcheck/tests/wcpncpy.stderr.exp
@@ -1,19 +1,19 @@
 Conditional jump or move depends on uninitialised value(s)
-   at 0x........: wcpncpy (vg_replace_strmem.c:2575)
+   at 0x........: wcpncpy (vg_replace_strmem.c:2573)
    by 0x........: main (wcpncpy.c:14)
 
 Invalid write of size 4
-   at 0x........: wcpncpy (vg_replace_strmem.c:2575)
+   at 0x........: wcpncpy (vg_replace_strmem.c:2573)
    by 0x........: main (wcpncpy.c:27)
  Address 0x........ is 20 bytes inside a block of size 22 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (wcpncpy.c:10)
 
 Source and destination overlap in wcpncpy(0x........, 0x........)
-   at 0x........: wcpncpy (vg_replace_strmem.c:2575)
+   at 0x........: wcpncpy (vg_replace_strmem.c:2573)
    by 0x........: main (wcpncpy.c:35)
 
 Source and destination overlap in wcpncpy(0x........, 0x........)
-   at 0x........: wcpncpy (vg_replace_strmem.c:2575)
+   at 0x........: wcpncpy (vg_replace_strmem.c:2573)
    by 0x........: main (wcpncpy.c:43)