[openssh-commits] [openssh] 01/01: Move DEF_WEAK into defines.h.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 032147b69527e5448a511049b2d43dbcae582624
Author: Darren Tucker <dtucker at zip.com.au>
Date:   Sat Oct 15 05:51:12 2016 +1100

    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.
---
 defines.h            | 7 +++++++
 openbsd-compat/vis.c | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/defines.h b/defines.h
index 68466a3..c89f85a 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.
  */
diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c
index 3cef6ba..0e04ed0 100644
--- a/openbsd-compat/vis.c
+++ b/openbsd-compat/vis.c
@@ -33,12 +33,6 @@
 #include "includes.h"
 #if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS)
 
-/*
- * We want these to override in the BROKEN_STRNVIS case.  TO avoid future sync
- * problems no-op out the weak symbol definition rather than remove it.
- */
-#define DEF_WEAK(x)
-
 #include <sys/types.h>
 #include <errno.h>
 #include <ctype.h>

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.