Index: sys/sys/_sockaddr_storage.h
===================================================================
--- sys/sys/_sockaddr_storage.h
+++ sys/sys/_sockaddr_storage.h
@@ -46,9 +46,9 @@
 struct sockaddr_storage {
        unsigned char   ss_len;         /* address length */
        sa_family_t     ss_family;      /* address family */
-       char            __ss_pad1[_SS_PAD1SIZE];
+       unsigned char   __ss_pad1[_SS_PAD1SIZE];
        __int64_t       __ss_align;     /* force desired struct alignment */
-       char            __ss_pad2[_SS_PAD2SIZE];
+       unsigned char   __ss_pad2[_SS_PAD2SIZE];
 };
 
 #endif /* !_SYS__SOCKADDR_STORAGE_H_ */
Index: sys/sys/param.h
===================================================================
--- sys/sys/param.h
+++ sys/sys/param.h
@@ -58,7 +58,7 @@
  *             in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1200046      /* Master, propagated to newvers */
+#define __FreeBSD_version 1200047      /* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,