From 09bdb7913c0bf7f2b15d1c7f46b566e35fc5eb82 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 10 Jan 2016 06:45:36 +0000 Subject: 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 --- include/ruby/missing.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'include/ruby') 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 #include /* 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 -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 -- cgit v1.2.3