diff options
| author | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-25 08:46:40 +0000 |
|---|---|---|
| committer | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-25 08:46:40 +0000 |
| commit | 0766b8af2a3348acbce1b8b6ccf9a5e68f29fb8b (patch) | |
| tree | ddca3b12aea80e2d3d628f5da64a592e9e998341 | |
| parent | fc9d7c15cf82c2bbb848c133e96d49e7c7064a84 (diff) | |
openssl: remove unnecessary 'extern "C"' blocks from local headers
* ext/openssl/openssl_missing.h, ext/openssl/ossl.h: Remove
unnecessary 'extern "C"' blocks. We don't use C++ and these headers
are local to ext/openssl, so there is no need to enclose with it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/openssl_missing.h | 9 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 8 |
3 files changed, 6 insertions, 17 deletions
@@ -1,3 +1,9 @@ +Wed May 25 17:43:30 2016 Kazuki Yamaguchi <k@rhe.jp> + + * ext/openssl/openssl_missing.h, ext/openssl/ossl.h: Remove + unnecessary 'extern "C"' blocks. We don't use C++ and these headers + are local to ext/openssl, so there is no need to enclose with it. + Wed May 25 17:42:58 2016 Kazuki Yamaguchi <k@rhe.jp> * ext/openssl/extconf.rb: Remove check of OPENSSL_FIPS macro. This is diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index 955579cf9f..b5bfd31eea 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -10,10 +10,6 @@ #if !defined(_OSSL_OPENSSL_MISSING_H_) #define _OSSL_OPENSSL_MISSING_H_ -#if defined(__cplusplus) -extern "C" { -#endif - #ifndef TYPEDEF_D2I_OF typedef char *d2i_of_void(); #endif @@ -193,9 +189,4 @@ int PEM_def_callback(char *buf, int num, int w, void *key); int ASN1_put_eoc(unsigned char **pp); #endif -#if defined(__cplusplus) -} -#endif - - #endif /* _OSSL_OPENSSL_MISSING_H_ */ diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 8da2ab479c..4a538e9b12 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -12,10 +12,6 @@ #include RUBY_EXTCONF_H -#if defined(__cplusplus) -extern "C" { -#endif - #if 0 mOSSL = rb_define_module("OpenSSL"); mX509 = rb_define_module_under(mOSSL, "X509"); @@ -247,8 +243,4 @@ void ossl_debug(const char *, ...); void Init_openssl(void); -#if defined(__cplusplus) -} -#endif - #endif /* _OSSL_H_ */ |