diff options
| author | Cosmin Truta <ctruta@magicleap.com> | 2018-09-14 12:33:57 +0200 |
|---|---|---|
| committer | Cosmin Truta <ctruta@magicleap.com> | 2018-09-14 12:33:57 +0200 |
| commit | 4005c19a5cbb3488719026a8efeb8220a9fd6f74 (patch) | |
| tree | 4607f55434e1b80fd3f5d8e08bb78002a71362af /lib/cryptohi | |
| parent | 02e73665c433efa93c00943b08e1ea5a06541a98 (diff) | |
| download | nss-hg-4005c19a5cbb3488719026a8efeb8220a9fd6f74.tar.gz | |
Bug 1480647 - Warn about deprecation of key.h and keyt.h. Include keyhi.h instead of key.h, and keythi.h instead of keyt.h. r=rrelyea
Diffstat (limited to 'lib/cryptohi')
| -rw-r--r-- | lib/cryptohi/cryptohi.h | 2 | ||||
| -rw-r--r-- | lib/cryptohi/key.h | 6 | ||||
| -rw-r--r-- | lib/cryptohi/keyt.h | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/cryptohi/cryptohi.h b/lib/cryptohi/cryptohi.h index e529fa34f..7b66f0b0b 100644 --- a/lib/cryptohi/cryptohi.h +++ b/lib/cryptohi/cryptohi.h @@ -14,7 +14,7 @@ #include "secoidt.h" #include "secdert.h" #include "cryptoht.h" -#include "keyt.h" +#include "keythi.h" #include "certt.h" SEC_BEGIN_PROTOS diff --git a/lib/cryptohi/key.h b/lib/cryptohi/key.h index 3e89b74cb..8392031c5 100644 --- a/lib/cryptohi/key.h +++ b/lib/cryptohi/key.h @@ -2,11 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* This header is deprecated. Please include keyhi.h instead. */ - #ifndef _KEY_H_ #define _KEY_H_ +#if defined(_MSC_VER) || defined(__GNUC__) || defined(__clang__) +#pragma message("key.h is deprecated. Please include keyhi.h instead.") +#endif + #include "keyhi.h" #endif /* _KEY_H_ */ diff --git a/lib/cryptohi/keyt.h b/lib/cryptohi/keyt.h index 99da312f6..5a0d2c2e7 100644 --- a/lib/cryptohi/keyt.h +++ b/lib/cryptohi/keyt.h @@ -5,6 +5,10 @@ #ifndef _KEYT_H_ #define _KEYT_H_ +#if defined(_MSC_VER) || defined(__GNUC__) || defined(__clang__) +#pragma message("keyt.h is deprecated. Please include keythi.h instead.") +#endif + #include "keythi.h" #endif /* _KEYT_H_ */ |