diff options
author | Darren Tucker <dtucker@dtucker.net> | 2018-02-27 08:41:25 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-02-27 08:51:56 +1100 |
commit | 1323f120d06a26074c4d154fcbe7f49bcad3d741 (patch) | |
tree | f54c849c6f1372cda95c5493358cbb87473aa5b6 /sshkey.h | |
parent | f0b245b0439e600fab782d19e97980e9f2c2533c (diff) |
Check for attributes on prototype args.
Some compilers (gcc 2.9.53, 3.0 and probably others, see gcc bug #3481)
do not accept __attribute__ on function pointer prototype args. Check for
this and hide them if they're not accepted.
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -220,7 +220,11 @@ int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, | |||
220 | int ssh_rsa_generate_additional_parameters(struct sshkey *); | 220 | int ssh_rsa_generate_additional_parameters(struct sshkey *); |
221 | 221 | ||
222 | /* stateful keys (e.g. XMSS) */ | 222 | /* stateful keys (e.g. XMSS) */ |
223 | #ifdef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS | ||
224 | typedef void sshkey_printfn(const char *, ...); | ||
225 | #else | ||
223 | typedef void sshkey_printfn(const char *, ...) __attribute__((format(printf, 1, 2))); | 226 | typedef void sshkey_printfn(const char *, ...) __attribute__((format(printf, 1, 2))); |
227 | #endif | ||
224 | int sshkey_set_filename(struct sshkey *, const char *); | 228 | int sshkey_set_filename(struct sshkey *, const char *); |
225 | int sshkey_enable_maxsign(struct sshkey *, u_int32_t); | 229 | int sshkey_enable_maxsign(struct sshkey *, u_int32_t); |
226 | u_int32_t sshkey_signatures_left(const struct sshkey *); | 230 | u_int32_t sshkey_signatures_left(const struct sshkey *); |