зеркало из https://github.com/github/ruby.git
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
This commit is contained in:
Родитель
fc9d7c15cf
Коммит
0766b8af2a
|
@ -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>
|
Wed May 25 17:42:58 2016 Kazuki Yamaguchi <k@rhe.jp>
|
||||||
|
|
||||||
* ext/openssl/extconf.rb: Remove check of OPENSSL_FIPS macro. This is
|
* ext/openssl/extconf.rb: Remove check of OPENSSL_FIPS macro. This is
|
||||||
|
|
|
@ -10,10 +10,6 @@
|
||||||
#if !defined(_OSSL_OPENSSL_MISSING_H_)
|
#if !defined(_OSSL_OPENSSL_MISSING_H_)
|
||||||
#define _OSSL_OPENSSL_MISSING_H_
|
#define _OSSL_OPENSSL_MISSING_H_
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef TYPEDEF_D2I_OF
|
#ifndef TYPEDEF_D2I_OF
|
||||||
typedef char *d2i_of_void();
|
typedef char *d2i_of_void();
|
||||||
#endif
|
#endif
|
||||||
|
@ -193,9 +189,4 @@ int PEM_def_callback(char *buf, int num, int w, void *key);
|
||||||
int ASN1_put_eoc(unsigned char **pp);
|
int ASN1_put_eoc(unsigned char **pp);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* _OSSL_OPENSSL_MISSING_H_ */
|
#endif /* _OSSL_OPENSSL_MISSING_H_ */
|
||||||
|
|
|
@ -12,10 +12,6 @@
|
||||||
|
|
||||||
#include RUBY_EXTCONF_H
|
#include RUBY_EXTCONF_H
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
mOSSL = rb_define_module("OpenSSL");
|
mOSSL = rb_define_module("OpenSSL");
|
||||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||||
|
@ -247,8 +243,4 @@ void ossl_debug(const char *, ...);
|
||||||
|
|
||||||
void Init_openssl(void);
|
void Init_openssl(void);
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _OSSL_H_ */
|
#endif /* _OSSL_H_ */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче