Merge pull request #94 from apoelstra/temp-merge-1309c03c45beece646a7d21fdb6a0e3d38adee2b
[upstream PR #773]: Fix some compile problems on weird/old compilers.
This commit is contained in:
commit
a3a3a17f47
@ -134,7 +134,7 @@ typedef int (*secp256k1_nonce_function)(
|
|||||||
# else
|
# else
|
||||||
# define SECP256K1_API
|
# define SECP256K1_API
|
||||||
# endif
|
# endif
|
||||||
# elif defined(__GNUC__) && defined(SECP256K1_BUILD)
|
# elif defined(__GNUC__) && (__GNUC__ >= 4) && defined(SECP256K1_BUILD)
|
||||||
# define SECP256K1_API __attribute__ ((visibility ("default")))
|
# define SECP256K1_API __attribute__ ((visibility ("default")))
|
||||||
# else
|
# else
|
||||||
# define SECP256K1_API
|
# define SECP256K1_API
|
||||||
|
@ -301,7 +301,7 @@ int secp256k1_ec_pubkey_serialize(const secp256k1_context* ctx, unsigned char *o
|
|||||||
|
|
||||||
VERIFY_CHECK(ctx != NULL);
|
VERIFY_CHECK(ctx != NULL);
|
||||||
ARG_CHECK(outputlen != NULL);
|
ARG_CHECK(outputlen != NULL);
|
||||||
ARG_CHECK(*outputlen >= ((flags & SECP256K1_FLAGS_BIT_COMPRESSION) ? 33 : 65));
|
ARG_CHECK(*outputlen >= ((flags & SECP256K1_FLAGS_BIT_COMPRESSION) ? 33u : 65u));
|
||||||
len = *outputlen;
|
len = *outputlen;
|
||||||
*outputlen = 0;
|
*outputlen = 0;
|
||||||
ARG_CHECK(output != NULL);
|
ARG_CHECK(output != NULL);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user