diff options
author | Szczepan Zalega <szczepan@nitrokey.com> | 2018-07-07 20:57:35 +0200 |
---|---|---|
committer | Szczepan Zalega <szczepan@nitrokey.com> | 2018-07-07 20:57:35 +0200 |
commit | 4b3b21dfe6958376db3b1fbcadf6e03f53291e4f (patch) | |
tree | 2c8ff7082f2d2fd6cebcbdca3d859925d147b296 | |
parent | 12cb892acdc3b248ede8fbfe75bc23a8cf02d6da (diff) | |
parent | 17ba7cbbfd6ea5c92d5a5df460751c599e65c9f3 (diff) | |
download | libnitrokey-4b3b21dfe6958376db3b1fbcadf6e03f53291e4f.tar.gz libnitrokey-4b3b21dfe6958376db3b1fbcadf6e03f53291e4f.tar.bz2 |
Merge branch 'pr_124'
Fixes #124
-rw-r--r-- | NK_C_API.h | 5 | ||||
-rw-r--r-- | libnitrokey/deprecated.h | 35 |
2 files changed, 39 insertions, 1 deletions
@@ -25,6 +25,8 @@ #include <stdbool.h> #include <stdint.h> +#include "deprecated.h" + #ifdef _MSC_VER #define NK_C_API __declspec(dllexport) #else @@ -417,7 +419,8 @@ extern "C" { */ NK_C_API int NK_totp_set_time_soft(uint64_t time); - [[deprecated("NK_totp_get_time is deprecated -- use NK_totp_set_time_soft instead")]] + // NK_totp_get_time is deprecated -- use NK_totp_set_time_soft instead + DEPRECATED NK_C_API int NK_totp_get_time(); //passwords diff --git a/libnitrokey/deprecated.h b/libnitrokey/deprecated.h new file mode 100644 index 0000000..5a83288 --- /dev/null +++ b/libnitrokey/deprecated.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018 Nitrokey UG + * + * This file is part of libnitrokey. + * + * libnitrokey is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * libnitrokey is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with libnitrokey. If not, see <http://www.gnu.org/licenses/>. + * + * SPDX-License-Identifier: LGPL-3.0 + */ + + +#ifndef LIBNITROKEY_DEPRECATED_H +#define LIBNITROKEY_DEPRECATED_H + +#if defined(__GNUC__) || defined(__clang__) +#define DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +#define DEPRECATED __declspec(deprecated) +#else +#pragma message("WARNING: DEPRECATED macro is not defined for this compiler") +#define DEPRECATED +#endif + +#endif //LIBNITROKEY_DEPRECATED_H |