From 6ba31b8ceeda54b64fcf1dcc3d375eac2a81b077 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 19 Aug 2019 08:29:11 +0000 Subject: [PATCH 1/2] Add cplusplus directive to musig include --- include/secp256k1_musig.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/secp256k1_musig.h b/include/secp256k1_musig.h index b24c94ce..7af7543f 100644 --- a/include/secp256k1_musig.h +++ b/include/secp256k1_musig.h @@ -1,6 +1,10 @@ #ifndef SECP256K1_MUSIG_H #define SECP256K1_MUSIG_H +#ifdef __cplusplus +extern "C" { +#endif + #include /** This module implements a Schnorr-based multi-signature scheme called MuSig @@ -426,4 +430,8 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_musig_extract_secret_ad int nonce_is_negated ) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4); +#ifdef __cplusplus +} +#endif + #endif From 217151df1c106684c064bdaa79a770c2566bc940 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 19 Aug 2019 08:35:15 +0000 Subject: [PATCH 2/2] Fix ARG_NONNULL macro usage in musig include --- include/secp256k1_musig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/secp256k1_musig.h b/include/secp256k1_musig.h index 7af7543f..744e8a8d 100644 --- a/include/secp256k1_musig.h +++ b/include/secp256k1_musig.h @@ -273,7 +273,7 @@ SECP256K1_API int secp256k1_musig_session_combine_nonces( size_t n_signers, int *nonce_is_negated, const secp256k1_pubkey *adaptor -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(4); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3); /** Sets the message of a session if previously unset *