summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/openssl/openssl_missing.h9
-rw-r--r--ext/openssl/ossl.h8
3 files changed, 6 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index a83bb38..aa1da0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 955579c..b5bfd31 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 8da2ab4..4a538e9 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_ */