tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Darren Tucker 2016-10-15 05:51:12 +11:00
parent e0259a82dd
commit 032147b695
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
defines.h
View File

@ -832,6 +832,13 @@ struct winsize {
# define SSH_IOBUFSZ 8192 # define SSH_IOBUFSZ 8192
#endif #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() * Platforms that have arc4random_uniform() and not arc4random_stir()
* shouldn't need the latter. * shouldn't need the latter.

6
openbsd-compat/vis.c
View File

@ -33,12 +33,6 @@
#include "includes.h" #include "includes.h"
#if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS) #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 <sys/types.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>