1Index: coregrind/m_main.c
2===================================================================
3--- a/coregrind/m_main.c (revision 16102)
4+++ b/coregrind/m_main.c (revision 16103)
5@@ -3489,6 +3489,10 @@
6 // skip check
7 return VG_(memset)(s,c,n);
8 }
9+void __bzero(void* s, UWord n);
10+void __bzero(void* s, UWord n) {
11+ (void)VG_(memset)(s,0,n);
12+}
13 void bzero(void *s, SizeT n);
14 void bzero(void *s, SizeT n) {
15 VG_(memset)(s,0,n);
16@@ -4058,20 +4062,7 @@
17
18 #endif
19
20-#if defined(VGO_darwin) && DARWIN_VERS == DARWIN_10_10
21
22-/* This might also be needed for > DARWIN_10_10, but I have no way
23- to test for that. Hence '==' rather than '>=' in the version
24- test above. */
25-void __bzero ( void* s, UWord n );
26-void __bzero ( void* s, UWord n )
27-{
28- (void) VG_(memset)( s, 0, n );
29-}
30-
31-#endif
32-
33-
34 /*--------------------------------------------------------------------*/
35 /*--- end ---*/
36 /*--------------------------------------------------------------------*/
37