diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 03:13:24 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 03:13:24 +0000 |
| commit | 2f0555c3a116b130eaa724842b014a31306f41de (patch) | |
| tree | 889652e1ea15e32411b8502501648d371b8798f5 /ext | |
| parent | bb6e171adbe29a7b0892f56a303c1715bf9a66e3 (diff) | |
merge revision(s) 55523: [Backport #12524]
* ext/digest/md5/md5ossl.h: Remove excess semicolons.
Suppress warning on Solaris with Oracle Solaris Studio 12.
[ruby-dev:49692] [Bug #12524]
* ext/digest/md5/md5cc.h: ditto.
* ext/digest/sha1/sha1cc.h: ditto.
* ext/digest/sha1/sha1ossl.h: ditto.
* ext/digest/sha2/sha2cc.h: ditto.
* ext/digest/sha2/sha2ossl.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/digest/md5/md5cc.h | 4 | ||||
| -rw-r--r-- | ext/digest/md5/md5ossl.h | 2 | ||||
| -rw-r--r-- | ext/digest/sha1/sha1cc.h | 4 | ||||
| -rw-r--r-- | ext/digest/sha1/sha1ossl.h | 2 | ||||
| -rw-r--r-- | ext/digest/sha2/sha2cc.h | 12 | ||||
| -rw-r--r-- | ext/digest/sha2/sha2ossl.h | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/ext/digest/md5/md5cc.h b/ext/digest/md5/md5cc.h index 63a7ae9d67..35652eac6a 100644 --- a/ext/digest/md5/md5cc.h +++ b/ext/digest/md5/md5cc.h @@ -3,8 +3,8 @@ #define MD5_BLOCK_LENGTH CC_MD5_BLOCK_BYTES -static DEFINE_UPDATE_FUNC_FOR_UINT(MD5); -static DEFINE_FINISH_FUNC_FROM_FINAL(MD5); +static DEFINE_UPDATE_FUNC_FOR_UINT(MD5) +static DEFINE_FINISH_FUNC_FROM_FINAL(MD5) #undef MD5_Update #undef MD5_Finish diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h index 2e9347ed94..94aa7ae77b 100644 --- a/ext/digest/md5/md5ossl.h +++ b/ext/digest/md5/md5ossl.h @@ -8,7 +8,7 @@ #define MD5_BLOCK_LENGTH MD5_CBLOCK -static DEFINE_FINISH_FUNC_FROM_FINAL(MD5); +static DEFINE_FINISH_FUNC_FROM_FINAL(MD5) #undef MD5_Finish #define MD5_Finish rb_digest_MD5_finish diff --git a/ext/digest/sha1/sha1cc.h b/ext/digest/sha1/sha1cc.h index 1376c49ec7..2ed8d646ab 100644 --- a/ext/digest/sha1/sha1cc.h +++ b/ext/digest/sha1/sha1cc.h @@ -5,8 +5,8 @@ #define SHA1_DIGEST_LENGTH CC_SHA1_DIGEST_LENGTH #define SHA1_CTX CC_SHA1_CTX -static DEFINE_UPDATE_FUNC_FOR_UINT(SHA1); -static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1); +static DEFINE_UPDATE_FUNC_FOR_UINT(SHA1) +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1) #undef SHA1_Update #undef SHA1_Finish diff --git a/ext/digest/sha1/sha1ossl.h b/ext/digest/sha1/sha1ossl.h index 80580b6460..599efe9a2f 100644 --- a/ext/digest/sha1/sha1ossl.h +++ b/ext/digest/sha1/sha1ossl.h @@ -15,7 +15,7 @@ #endif #define SHA1_DIGEST_LENGTH SHA_DIGEST_LENGTH -static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1); +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1) #undef SHA1_Finish #define SHA1_Finish rb_digest_SHA1_finish diff --git a/ext/digest/sha2/sha2cc.h b/ext/digest/sha2/sha2cc.h index 49d463088f..3f99604465 100644 --- a/ext/digest/sha2/sha2cc.h +++ b/ext/digest/sha2/sha2cc.h @@ -7,12 +7,12 @@ #define SHA384_CTX CC_SHA512_CTX -static DEFINE_UPDATE_FUNC_FOR_UINT(SHA256); -static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256); -static DEFINE_UPDATE_FUNC_FOR_UINT(SHA384); -static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384); -static DEFINE_UPDATE_FUNC_FOR_UINT(SHA512); -static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512); +static DEFINE_UPDATE_FUNC_FOR_UINT(SHA256) +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256) +static DEFINE_UPDATE_FUNC_FOR_UINT(SHA384) +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384) +static DEFINE_UPDATE_FUNC_FOR_UINT(SHA512) +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512) #undef SHA256_Update diff --git a/ext/digest/sha2/sha2ossl.h b/ext/digest/sha2/sha2ossl.h index f7258ee64a..8dd0530107 100644 --- a/ext/digest/sha2/sha2ossl.h +++ b/ext/digest/sha2/sha2ossl.h @@ -20,8 +20,8 @@ typedef SHA512_CTX SHA384_CTX; #define SHA256_Finish rb_digest_SHA256_finish #define SHA384_Finish rb_digest_SHA384_finish #define SHA512_Finish rb_digest_SHA512_finish -static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256); -static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384); -static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512); +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256) +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384) +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512) #endif |