diff mbox series

[05/12] slirp: poison IN6_*_ADDR_*() macros to avoid them

Message ID 20180108172904.8772-6-f4bug@amsat.org
State New
Headers show
Series add HOST_SUPPORTS_UNALIGNED_ACCESS, reduce slirp warnings | expand

Commit Message

Philippe Mathieu-Daudé Jan. 8, 2018, 5:28 p.m. UTC 
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 slirp/ip6.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Comments

Thomas Huth Jan. 8, 2018, 5:46 p.m. UTC | #1 
Please add a proper patch description here why you are doing this. At
least it is not clear to me at a first glance.

 Thomas


On 08.01.2018 18:28, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  slirp/ip6.h | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/slirp/ip6.h b/slirp/ip6.h
> index 6c5d4eeaa3..c6493a0856 100644
> --- a/slirp/ip6.h
> +++ b/slirp/ip6.h
> @@ -8,6 +8,25 @@
>  
>  #include "net/eth.h"
>  
> +#ifdef __GNUC__
> +# undef IN6_IS_ADDR_UNSPECIFIED
> +# pragma GCC poison IN6_IS_ADDR_UNSPECIFIED
> +# undef IN6_IS_ADDR_LOOPBACK
> +# pragma GCC poison IN6_IS_ADDR_LOOPBACK
> +# undef IN6_IS_ADDR_LINKLOCAL
> +# pragma GCC poison IN6_IS_ADDR_LINKLOCAL
> +# undef IN6_IS_ADDR_SITELOCAL
> +# pragma GCC poison IN6_IS_ADDR_SITELOCAL
> +# undef IN6_IS_ADDR_V4MAPPED
> +# pragma GCC poison IN6_IS_ADDR_V4MAPPED
> +# undef IN6_IS_ADDR_V4COMPAT
> +# pragma GCC poison IN6_IS_ADDR_V4COMPAT
> +# undef IN6_ARE_ADDR_EQUAL
> +# pragma GCC poison IN6_ARE_ADDR_EQUAL
> +# undef IN6_IS_ADDR_MULTICAST
> +# pragma GCC poison IN6_IS_ADDR_MULTICAST
> +#endif
> +
>  #define ALLNODES_MULTICAST  { .s6_addr = \
>                              { 0xff, 0x02, 0x00, 0x00,\
>                              0x00, 0x00, 0x00, 0x00,\
>
diff mbox series

Patch

diff --git a/slirp/ip6.h b/slirp/ip6.h
index 6c5d4eeaa3..c6493a0856 100644
--- a/slirp/ip6.h
+++ b/slirp/ip6.h
@@ -8,6 +8,25 @@ 
 
 #include "net/eth.h"
 
+#ifdef __GNUC__
+# undef IN6_IS_ADDR_UNSPECIFIED
+# pragma GCC poison IN6_IS_ADDR_UNSPECIFIED
+# undef IN6_IS_ADDR_LOOPBACK
+# pragma GCC poison IN6_IS_ADDR_LOOPBACK
+# undef IN6_IS_ADDR_LINKLOCAL
+# pragma GCC poison IN6_IS_ADDR_LINKLOCAL
+# undef IN6_IS_ADDR_SITELOCAL
+# pragma GCC poison IN6_IS_ADDR_SITELOCAL
+# undef IN6_IS_ADDR_V4MAPPED
+# pragma GCC poison IN6_IS_ADDR_V4MAPPED
+# undef IN6_IS_ADDR_V4COMPAT
+# pragma GCC poison IN6_IS_ADDR_V4COMPAT
+# undef IN6_ARE_ADDR_EQUAL
+# pragma GCC poison IN6_ARE_ADDR_EQUAL
+# undef IN6_IS_ADDR_MULTICAST
+# pragma GCC poison IN6_IS_ADDR_MULTICAST
+#endif
+
 #define ALLNODES_MULTICAST  { .s6_addr = \
                             { 0xff, 0x02, 0x00, 0x00,\
                             0x00, 0x00, 0x00, 0x00,\