[前][次][番号順一覧][スレッド一覧]

ruby-changes:43087

From: rhe <ko1@a...>
Date: Wed, 25 May 2016 17:46:45 +0900 (JST)
Subject: [ruby-changes:43087] rhe:r55161 (trunk): openssl: remove unnecessary 'extern "C"' blocks from local headers

rhe	2016-05-25 17:46:40 +0900 (Wed, 25 May 2016)

  New Revision: 55161

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55161

  Log:
    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.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/openssl_missing.h
    trunk/ext/openssl/ossl.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55160)
+++ ChangeLog	(revision 55161)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed May 25 17:43:30 2016  Kazuki Yamaguchi  <k@r...>
+
+	* 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@r...>
 
 	* ext/openssl/extconf.rb: Remove check of OPENSSL_FIPS macro. This is
Index: ext/openssl/ossl.h
===================================================================
--- ext/openssl/ossl.h	(revision 55160)
+++ ext/openssl/ossl.h	(revision 55161)
@@ -12,10 +12,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl.h#L12
 
 #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 *, ...); https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl.h#L243
 
 void Init_openssl(void);
 
-#if defined(__cplusplus)
-}
-#endif
-
 #endif /* _OSSL_H_ */
Index: ext/openssl/openssl_missing.h
===================================================================
--- ext/openssl/openssl_missing.h	(revision 55160)
+++ ext/openssl/openssl_missing.h	(revision 55161)
@@ -10,10 +10,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/openssl_missing.h#L10
 #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, https://github.com/ruby/ruby/blob/trunk/ext/openssl/openssl_missing.h#L189
 int ASN1_put_eoc(unsigned char **pp);
 #endif
 
-#if defined(__cplusplus)
-}
-#endif
-
-
 #endif /* _OSSL_OPENSSL_MISSING_H_ */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]