diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-10 06:45:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-10 06:45:36 +0000 |
| commit | e5c8eea039f28ba38fcaa067b43a8dec19d34fc4 (patch) | |
| tree | ef4693486301a3651a7d02df9b1e42e7d31e21fa /include | |
| parent | 22e9da86d000857d037aa776af5702e82d73c244 (diff) | |
| download | ruby-e5c8eea039f28ba38fcaa067b43a8dec19d34fc4.tar.gz | |
missing.h: remove explicit_bzero_by_memset_s
* include/ruby/missing.h (explicit_bzero_by_memset_s): remove
inline implementation by memset_s, which needs a macro before
including headers and can cause problems in extension libraries
by the order of the macro and headers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/missing.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/ruby/missing.h b/include/ruby/missing.h index 8db33496ab..97091606b0 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -18,10 +18,6 @@ extern "C" { #endif #endif -#ifndef __STDC_WANT_LIB_EXT1__ -#define __STDC_WANT_LIB_EXT1__ 1 -#endif - #include "ruby/config.h" #include <stddef.h> #include <math.h> /* for INFINITY and NAN */ @@ -248,15 +244,7 @@ RUBY_EXTERN void setproctitle(const char *fmt, ...); #ifndef HAVE_EXPLICIT_BZERO RUBY_EXTERN void explicit_bzero(void *b, size_t len); -# ifdef HAVE_MEMSET_S -# include <string.h> -static inline void -explicit_bzero_by_memset_s(void *b, size_t len) -{ - memset_s(b, len, 0, len); -} -# define explicit_bzero(b, len) explicit_bzero_by_memset_s(b, len) -# elif defined SecureZeroMemory +# if defined SecureZeroMemory # define explicit_bzero(b, len) SecureZeroMemory(b, len) # endif #endif |