diff options
-rw-r--r-- | defines.h | 7 | ||||
-rw-r--r-- | openbsd-compat/vis.c | 6 |
2 files changed, 7 insertions, 6 deletions
@@ -833,6 +833,13 @@ struct winsize { | |||
833 | #endif | 833 | #endif |
834 | 834 | ||
835 | /* | 835 | /* |
836 | * We want functions in openbsd-compat, if enabled, to override system ones. | ||
837 | * We no-op out the weak symbol definition rather than remove it to reduce | ||
838 | * future sync problems. | ||
839 | */ | ||
840 | #define DEF_WEAK(x) | ||
841 | |||
842 | /* | ||
836 | * Platforms that have arc4random_uniform() and not arc4random_stir() | 843 | * Platforms that have arc4random_uniform() and not arc4random_stir() |
837 | * shouldn't need the latter. | 844 | * shouldn't need the latter. |
838 | */ | 845 | */ |
diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c index 3cef6bafd..0e04ed025 100644 --- a/openbsd-compat/vis.c +++ b/openbsd-compat/vis.c | |||
@@ -33,12 +33,6 @@ | |||
33 | #include "includes.h" | 33 | #include "includes.h" |
34 | #if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS) | 34 | #if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS) |
35 | 35 | ||
36 | /* | ||
37 | * We want these to override in the BROKEN_STRNVIS case. TO avoid future sync | ||
38 | * problems no-op out the weak symbol definition rather than remove it. | ||
39 | */ | ||
40 | #define DEF_WEAK(x) | ||
41 | |||
42 | #include <sys/types.h> | 36 | #include <sys/types.h> |
43 | #include <errno.h> | 37 | #include <errno.h> |
44 | #include <ctype.h> | 38 | #include <ctype.h> |