summaryrefslogtreecommitdiffstats
path: root/defines.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2016-10-14 20:51:12 +0200
committerDarren Tucker <dtucker@zip.com.au>2016-10-14 20:51:12 +0200
commit032147b69527e5448a511049b2d43dbcae582624 (patch)
tree935ead300d7068d105477ef4bac264e917032ccd /defines.h
parentRemove do_pam_set_tty which is dead code. (diff)
downloadopenssh-032147b69527e5448a511049b2d43dbcae582624.tar.xz
openssh-032147b69527e5448a511049b2d43dbcae582624.zip
Move DEF_WEAK into defines.h.
As well pull in more recent changes from OpenBSD these will start to arrive so put it where the definition is shared.
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/defines.h b/defines.h
index 68466a340..c89f85a8d 100644
--- a/defines.h
+++ b/defines.h
@@ -833,6 +833,13 @@ struct winsize {
#endif
/*
+ * 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.
+ */
+#define DEF_WEAK(x)
+
+/*
* Platforms that have arc4random_uniform() and not arc4random_stir()
* shouldn't need the latter.
*/