git: 2556fce493ab - stable/13 - Silence a macro-redefined warning when crossbuilding

[Alex Richardson]

The branch stable/13 has been updated by arichardson:

URL: https://cgit.FreeBSD.org/src/commit/?id=2556fce493ab586e287ea690532fc0c89d488d4b

commit 2556fce493ab586e287ea690532fc0c89d488d4b
Author:     Alex Richardson <arichardson at FreeBSD.org>
AuthorDate: 2021-03-01 14:11:20 +0000
Commit:     Alex Richardson <arichardson at FreeBSD.org>
CommitDate: 2021-03-17 22:22:48 +0000

    Silence a macro-redefined warning when crossbuilding
    
    This is already defined by the ncurses headers, so just undef it before
    defining it again.
    
    (cherry picked from commit 10f2a0c2e8766e9878ad4181f555d8dda84da34e)
---
 tools/build/cross-build/include/common/string.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/build/cross-build/include/common/string.h b/tools/build/cross-build/include/common/string.h
index dd039d54583e..8a33f4d4ff19 100644
--- a/tools/build/cross-build/include/common/string.h
+++ b/tools/build/cross-build/include/common/string.h
@@ -38,7 +38,9 @@
 #pragma once
 
 /* Avoid incompatible opensolaris redeclarations (without _FORTIFY_SOURCE). */
+#undef HAVE_STRLCAT
 #define HAVE_STRLCAT 1
+#undef HAVE_STRLCPY
 #define HAVE_STRLCPY 1
 
 #include_next <string.h>