bzero is non-POSIX (deprecated), accordingly __bzero template required for all macOS...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16103

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index d008ab3ae9ec25835b4031214685f5ddfea8a345..3fbab26daec7b01de7b72675b4decf6d3126827d 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -3489,6 +3489,10 @@ void* __memset_chk(void *s, int c, SizeT n, SizeT n2) {
     // skip check
   return VG_(memset)(s,c,n);
 }
+void __bzero(void* s, UWord n);
+void __bzero(void* s, UWord n) {
+    (void)VG_(memset)(s,0,n);
+}
 void bzero(void *s, SizeT n);
 void bzero(void *s, SizeT n) {
     VG_(memset)(s,0,n);
@@ -4058,19 +4062,6 @@ UWord voucher_mach_msg_set ( UWord arg1 )
 
 #endif
 
-#if defined(VGO_darwin) && DARWIN_VERS == DARWIN_10_10
-
-/* This might also be needed for > DARWIN_10_10, but I have no way
-   to test for that.  Hence '==' rather than '>=' in the version
-   test above. */
-void __bzero ( void* s, UWord n );
-void __bzero ( void* s, UWord n )
-{
-   (void) VG_(memset)( s, 0, n );
-}
-
-#endif
-
 
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/