aboutsummaryrefslogtreecommitdiffstats
path: root/lib/explicit_bzero.c
diff options
context:
space:
mode:
authorPaul Eggert2018-01-01 01:19:57 +0000
committerPaul Eggert2017-12-31 17:21:33 -0800
commit220a9ecba1b62e09703cb0a3c122797d4498ccc2 (patch)
tree97d286479f4b8c15205f78e61635de9b93993707 /lib/explicit_bzero.c
parent312c5655669a882186884626f0cf361de70e679d (diff)
downloademacs-220a9ecba1b62e09703cb0a3c122797d4498ccc2.tar.gz
emacs-220a9ecba1b62e09703cb0a3c122797d4498ccc2.zip
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.c4
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 @@
1/* Erasure of sensitive data, generic implementation. 1/* Erasure of sensitive data, generic implementation.
2 Copyright (C) 2016-2017 Free Software Foundation, Inc. 2 Copyright (C) 2016-2018 Free Software Foundation, Inc.
3 This file is part of the GNU C Library. 3 This file is part of the GNU C Library.
4 4
5 The GNU C Library is free software; you can redistribute it and/or 5 The GNU C Library is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ explicit_bzero (void *s, size_t len)
40 explicit_memset (s, 0, len); 40 explicit_memset (s, 0, len);
41#else 41#else
42 memset (s, '\0', len); 42 memset (s, '\0', len);
43# ifdef __GNUC__ 43# if defined __GNUC__ && !defined __clang__
44 /* Compiler barrier. */ 44 /* Compiler barrier. */
45 asm volatile ("" ::: "memory"); 45 asm volatile ("" ::: "memory");
46# endif 46# endif