diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:19:57 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-12-31 17:21:33 -0800 |
commit | 220a9ecba1b62e09703cb0a3c122797d4498ccc2 (patch) | |
tree | 97d286479f4b8c15205f78e61635de9b93993707 /lib/explicit_bzero.c | |
parent | 312c5655669a882186884626f0cf361de70e679d (diff) | |
download | emacs-220a9ecba1b62e09703cb0a3c122797d4498ccc2.tar.gz |
Merge from Gnulib
This incorporates:
2018-01-01 maint: Run 'make update-copyright'
2017-12-29 Add cross-compilation results for GNU/Hurd.
2017-12-12 explicit_bzero: port to macOS + Clang 9.0.0
Diffstat (limited to 'lib/explicit_bzero.c')
-rw-r--r-- | lib/explicit_bzero.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/explicit_bzero.c b/lib/explicit_bzero.c index 09093467769..78ec747c3a6 100644 --- a/lib/explicit_bzero.c +++ b/lib/explicit_bzero.c @@ -1,5 +1,5 @@ /* Erasure of sensitive data, generic implementation. - Copyright (C) 2016-2017 Free Software Foundation, Inc. + Copyright (C) 2016-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -40,7 +40,7 @@ explicit_bzero (void *s, size_t len) explicit_memset (s, 0, len); #else memset (s, '\0', len); -# ifdef __GNUC__ +# if defined __GNUC__ && !defined __clang__ /* Compiler barrier. */ asm volatile ("" ::: "memory"); # endif |