24 lines
638 B
Diff
24 lines
638 B
Diff
|
bzero is a macro in android-21
|
||
|
|
|
||
|
|
diff -u -r ../openssh-6.7p1/openbsd-compat/explicit_bzero.c ./openbsd-compat/explicit_bzero.c
|
||
|
|
--- ../openssh-6.7p1/openbsd-compat/explicit_bzero.c 2014-08-26 16:32:02.000000000 -0400
|
||
|
|
+++ ./openbsd-compat/explicit_bzero.c 2014-12-20 10:01:24.551588019 -0500
|
||
|
|
@@ -23,16 +23,10 @@
|
||
|
|
|
||
|
|
#else /* HAVE_MEMSET_S */
|
||
|
|
|
||
|
|
-/*
|
||
|
|
- * Indirect bzero through a volatile pointer to hopefully avoid
|
||
|
|
- * dead-store optimisation eliminating the call.
|
||
|
|
- */
|
||
|
|
-static void (* volatile ssh_bzero)(void *, size_t) = bzero;
|
||
|
|
-
|
||
|
|
void
|
||
|
|
explicit_bzero(void *p, size_t n)
|
||
|
|
{
|
||
|
|
- ssh_bzero(p, n);
|
||
|
|
+ bzero(p, n);
|
||
|
|
}
|
||
|
|
|
||
|
|
#endif /* HAVE_MEMSET_S */
|