diff options
author | Darren Tucker <dtucker@dtucker.net> | 2019-10-08 05:44:50 +0200 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2019-10-08 05:48:32 +0200 |
commit | 0c7f8d2326d812b371f7afd63aff846973ec80a4 (patch) | |
tree | 9d0959b62459c60b30fbbbb653036693477583c9 /defines.h | |
parent | upstream: Instead of running sed over the whole log to remove CRs, (diff) | |
download | openssh-0c7f8d2326d812b371f7afd63aff846973ec80a4.tar.xz openssh-0c7f8d2326d812b371f7afd63aff846973ec80a4.zip |
Make DEF_WEAK more likely to be correct.
Completely nop-ing out DEF_WEAK leaves an empty statemment which some
compilers don't like. Replace with a no-op function template. ok djm@
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -839,9 +839,10 @@ struct winsize { /* * We want functions in openbsd-compat, if enabled, to override system ones. * We no-op out the weak symbol definition rather than remove it to reduce - * future sync problems. + * future sync problems. Some compilers (eg Unixware) do not allow an + * empty statement, so we use a bogus function declaration. */ -#define DEF_WEAK(x) +#define DEF_WEAK(x) void __ssh_compat_weak_##x(void) /* * Platforms that have arc4random_uniform() and not arc4random_stir() |