diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:50:25 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:50:25 +0100 |
| commit | 4fb2cb1a30fc188682ae4dbda2f975213e5c3adf (patch) | |
| tree | 522b2dc8096cc37ace66686de36b486b73a352f5 /mysys_ssl | |
| parent | c0f5fd27549c84607defa64c5b651343dd29e0ee (diff) | |
| parent | 9ed8deb656d9378fc9c1c7fb12c15674b6323ab0 (diff) | |
| download | mariadb-git-4fb2cb1a30fc188682ae4dbda2f975213e5c3adf.tar.gz | |
Merge branch '10.7' into 10.8
Diffstat (limited to 'mysys_ssl')
| -rw-r--r-- | mysys_ssl/my_sha.inl (renamed from mysys_ssl/my_sha.ic) | 0 | ||||
| -rw-r--r-- | mysys_ssl/my_sha1.cc | 2 | ||||
| -rw-r--r-- | mysys_ssl/my_sha224.cc | 2 | ||||
| -rw-r--r-- | mysys_ssl/my_sha256.cc | 2 | ||||
| -rw-r--r-- | mysys_ssl/my_sha384.cc | 2 | ||||
| -rw-r--r-- | mysys_ssl/my_sha512.cc | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/mysys_ssl/my_sha.ic b/mysys_ssl/my_sha.inl index 6bba614765e..6bba614765e 100644 --- a/mysys_ssl/my_sha.ic +++ b/mysys_ssl/my_sha.inl diff --git a/mysys_ssl/my_sha1.cc b/mysys_ssl/my_sha1.cc index b53e214468d..29563742e6b 100644 --- a/mysys_ssl/my_sha1.cc +++ b/mysys_ssl/my_sha1.cc @@ -15,4 +15,4 @@ #define NUM 1 -#include "my_sha.ic" +#include "my_sha.inl" diff --git a/mysys_ssl/my_sha224.cc b/mysys_ssl/my_sha224.cc index 200b6ed161c..5fffdce7794 100644 --- a/mysys_ssl/my_sha224.cc +++ b/mysys_ssl/my_sha224.cc @@ -15,4 +15,4 @@ #define NUM 224 -#include "my_sha.ic" +#include "my_sha.inl" diff --git a/mysys_ssl/my_sha256.cc b/mysys_ssl/my_sha256.cc index 1562809f91a..59e871de121 100644 --- a/mysys_ssl/my_sha256.cc +++ b/mysys_ssl/my_sha256.cc @@ -15,4 +15,4 @@ #define NUM 256 -#include "my_sha.ic" +#include "my_sha.inl" diff --git a/mysys_ssl/my_sha384.cc b/mysys_ssl/my_sha384.cc index 6bb64470105..40707de0a8d 100644 --- a/mysys_ssl/my_sha384.cc +++ b/mysys_ssl/my_sha384.cc @@ -15,4 +15,4 @@ #define NUM 384 -#include "my_sha.ic" +#include "my_sha.inl" diff --git a/mysys_ssl/my_sha512.cc b/mysys_ssl/my_sha512.cc index 1047d0dbe46..6a5a04d72f0 100644 --- a/mysys_ssl/my_sha512.cc +++ b/mysys_ssl/my_sha512.cc @@ -15,4 +15,4 @@ #define NUM 512 -#include "my_sha.ic" +#include "my_sha.inl" |