Print this page
7127  remove -Wno-missing-braces from Makefile.uts

*** 41,56 **** #include <inet/ip_ire.h> #include <inet/ip_if.h> #include <inet/ipclassifier.h> #define IN6ADDR_MASK128_INIT \ ! { 0xffffffffU, 0xffffffffU, 0xffffffffU, 0xffffffffU } ! #define IN6ADDR_MASK96_INIT { 0xffffffffU, 0xffffffffU, 0xffffffffU, 0 } #ifdef _BIG_ENDIAN ! #define IN6ADDR_MASK16_INIT { 0xffff0000U, 0, 0, 0 } #else ! #define IN6ADDR_MASK16_INIT { 0x0000ffffU, 0, 0, 0 } #endif /* * This table is ordered such that longest prefix matches are hit first --- 41,56 ---- #include <inet/ip_ire.h> #include <inet/ip_if.h> #include <inet/ipclassifier.h> #define IN6ADDR_MASK128_INIT \ ! {{{ 0xffffffffU, 0xffffffffU, 0xffffffffU, 0xffffffffU }}} ! #define IN6ADDR_MASK96_INIT {{{ 0xffffffffU, 0xffffffffU, 0xffffffffU, 0 }}} #ifdef _BIG_ENDIAN ! #define IN6ADDR_MASK16_INIT {{{ 0xffff0000U, 0, 0, 0 }}} #else ! #define IN6ADDR_MASK16_INIT {{{ 0x0000ffffU, 0, 0, 0 }}} #endif /* * This table is ordered such that longest prefix matches are hit first
*** 57,82 **** * (longer prefix lengths first). The last entry must be the "default" * entry (::0/0). */ static ip6_asp_t default_ip6_asp_table[] = { { IN6ADDR_LOOPBACK_INIT, IN6ADDR_MASK128_INIT, ! "Loopback", 50 }, { IN6ADDR_ANY_INIT, IN6ADDR_MASK96_INIT, ! "IPv4_Compatible", 20 }, #ifdef _BIG_ENDIAN ! { { 0, 0, 0x0000ffffU, 0 }, IN6ADDR_MASK96_INIT, ! "IPv4", 10 }, ! { { 0x20020000U, 0, 0, 0 }, IN6ADDR_MASK16_INIT, ! "6to4", 30 }, #else ! { { 0, 0, 0xffff0000U, 0 }, IN6ADDR_MASK96_INIT, ! "IPv4", 10 }, ! { { 0x00000220U, 0, 0, 0 }, IN6ADDR_MASK16_INIT, ! "6to4", 30 }, #endif { IN6ADDR_ANY_INIT, IN6ADDR_ANY_INIT, ! "Default", 40 } }; /* * The IPv6 Default Address Selection policy table. * Until someone up above reconfigures the policy table, use the global --- 57,82 ---- * (longer prefix lengths first). The last entry must be the "default" * entry (::0/0). */ static ip6_asp_t default_ip6_asp_table[] = { { IN6ADDR_LOOPBACK_INIT, IN6ADDR_MASK128_INIT, ! {"Loopback"}, 50 }, { IN6ADDR_ANY_INIT, IN6ADDR_MASK96_INIT, ! {"IPv4_Compatible"}, 20 }, #ifdef _BIG_ENDIAN ! { {{{ 0, 0, 0x0000ffffU, 0 }}}, IN6ADDR_MASK96_INIT, ! {"IPv4"}, 10 }, ! { {{{ 0x20020000U, 0, 0, 0 }}}, IN6ADDR_MASK16_INIT, ! {"6to4"}, 30 }, #else ! { {{{ 0, 0, 0xffff0000U, 0 }}}, IN6ADDR_MASK96_INIT, ! {"IPv4"}, 10 }, ! { {{{ 0x00000220U, 0, 0, 0 }}}, IN6ADDR_MASK16_INIT, ! {"6to4"}, 30 }, #endif { IN6ADDR_ANY_INIT, IN6ADDR_ANY_INIT, ! {"Default"}, 40 } }; /* * The IPv6 Default Address Selection policy table. * Until someone up above reconfigures the policy table, use the global