Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | bzero is a macro in android-21 |
2 | ||
3 | diff -u -r ../openssh-6.7p1/openbsd-compat/explicit_bzero.c ./openbsd-compat/explicit_bzero.c | |
4 | --- ../openssh-6.7p1/openbsd-compat/explicit_bzero.c 2014-08-26 16:32:02.000000000 -0400 | |
5 | +++ ./openbsd-compat/explicit_bzero.c 2014-12-20 10:01:24.551588019 -0500 | |
6 | @@ -23,16 +23,10 @@ | |
7 | ||
8 | #else /* HAVE_MEMSET_S */ | |
9 | ||
10 | -/* | |
11 | - * Indirect bzero through a volatile pointer to hopefully avoid | |
12 | - * dead-store optimisation eliminating the call. | |
13 | - */ | |
14 | -static void (* volatile ssh_bzero)(void *, size_t) = bzero; | |
15 | - | |
16 | void | |
17 | explicit_bzero(void *p, size_t n) | |
18 | { | |
19 | - ssh_bzero(p, n); | |
20 | + bzero(p, n); | |
21 | } | |
22 | ||
23 | #endif /* HAVE_MEMSET_S */ |