Update libutp. Fixes #5128.

diff --git a/third-party/libutp/templates.h b/third-party/libutp/templates.h
index 17e72432a6f69a3cc9cb45012a62f2f42dee5f81..9684b52b3ac30bfd382b5320335cd46ae9092ab3 100644 (file)
--- a/third-party/libutp/templates.h
+++ b/third-party/libutp/templates.h
@@ -27,6 +27,12 @@
 #define PACKED_ATTRIBUTE\r
 #endif\r
 \r
+#ifdef __GNUC__\r
+#define ALIGNED_ATTRIBUTE(x)  __attribute__((aligned (x)))\r
+#else\r
+#define ALIGNED_ATTRIBUTE(x)\r
+#endif\r
+\r
 // Utility templates\r
 #undef min\r
 #undef max\r

diff --git a/third-party/libutp/utp.cpp b/third-party/libutp/utp.cpp
index 61142d60bc1c4d96fcfed71bd719ba9ecae4cce1..ccadcf9d273c85dd6e2ae0fb9187bf60ee403bb2 100644 (file)
--- a/third-party/libutp/utp.cpp
+++ b/third-party/libutp/utp.cpp
@@ -194,7 +194,7 @@ struct PACKED_ATTRIBUTE PackedSockAddr {
                snprintf(i, len - (i-s), ":%u", _port);\r
                return s;\r
        }\r
-};\r
+} ALIGNED_ATTRIBUTE(4);\r
 \r
 struct PACKED_ATTRIBUTE RST_Info {\r
        PackedSockAddr addr;\r