commit 19dce3a772a8cc99215ef15cfb152eb027471c1a
author Elliott Hughes <enh@google.com> Fri Dec 08 16:28:27 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 08 16:28:27 2023 +0000
tree aa518d8caa939f46f861f56ea1c1555ab6439d99
parent ed04b1122d360090e9336c9aac31013d7923fb57
parent 04f5b0c7af9b0020d9e2249783bd59184db2cca7

Track bionic uapi header change. am: 94846949d5 am: bae07997ea am: 04f5b0c7af

Original change: https://android-review.googlesource.com/c/platform/external/musl/+/2862831

Change-Id: Ibeae4ca7577ab28d83ac29cc650001f2b6ef8af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/include/bits/sockaddr_storage.h

diff --git a/android/include/bits/sockaddr_storage.h b/android/include/bits/sockaddr_storage.h
new file mode 100644
index 0000000..0de9de1
--- /dev/null
+++ b/android/include/bits/sockaddr_storage.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <features.h>
+
+#define __NEED_sa_family_t
+#include <bits/alltypes.h>
+
+struct sockaddr_storage {
+	sa_family_t ss_family;
+	char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
+	unsigned long __ss_align;
+};

include/sys/socket.h

diff --git a/include/sys/socket.h b/include/sys/socket.h
index 0b39d83..acbe63c 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -371,11 +371,7 @@
 	char sa_data[14];
 };
 
-struct sockaddr_storage {
-	sa_family_t ss_family;
-	char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
-	unsigned long __ss_align;
-};
+#include <bits/sockaddr_storage.h>
 
 int socket (int, int, int);
 int socketpair (int, int, int, int [2]);