diff options
| author | Kenneth Myhra <kennethmyhra@gmail.com> | 2021-09-19 11:10:16 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-09-19 15:53:43 +0200 |
| commit | 177765642e73a90147c2cc1b0196e8426321137b (patch) | |
| tree | e722cebf43784ecf0ab09871e6800b91dfa5b461 | |
| parent | c7422dcef713cc80e0af447e853d37e9fbb6590c (diff) | |
| download | serenity-177765642e73a90147c2cc1b0196e8426321137b.zip | |
Ports/glib: Remove patch 0008-add-missing-macro-IN6_IS_ADDR_V4MAPPED
Since we now have the 'IN6_IS_ADDR_V4MAPPED' macro in LibC this patch
is no longer needed.
| -rw-r--r-- | Ports/glib/patches/0008-add-missing-macro-IN6_IS_ADDR_V4MAPPED.patch | 33 | ||||
| -rw-r--r-- | Ports/glib/patches/README.md | 10 |
2 files changed, 0 insertions, 43 deletions
diff --git a/Ports/glib/patches/0008-add-missing-macro-IN6_IS_ADDR_V4MAPPED.patch b/Ports/glib/patches/0008-add-missing-macro-IN6_IS_ADDR_V4MAPPED.patch deleted file mode 100644 index 1d3fe4dd64..0000000000 --- a/Ports/glib/patches/0008-add-missing-macro-IN6_IS_ADDR_V4MAPPED.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f228b35ce89f2ccf6d8c84a8a35c3e7279ddb424 Mon Sep 17 00:00:00 2001 -From: Kenneth Myhra <kennethmyhra@gmail.com> -Date: Thu, 12 Aug 2021 20:51:13 +0200 -Subject: [PATCH 08/12] gio/gsocketaddress.c: Add missing macro - IN6_IS_ADDR_V4MAPPED - ---- - gio/gsocketaddress.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/gio/gsocketaddress.c b/gio/gsocketaddress.c -index 2b7e83c..88d757c 100644 ---- a/gio/gsocketaddress.c -+++ b/gio/gsocketaddress.c -@@ -39,6 +39,15 @@ - #include "gunixsocketaddress.h" - #endif - -+#ifndef IN6_IS_ADDR_V4MAPPED -+#define IN6_IS_ADDR_V4MAPPED(a) \ -+((((a)->s6_addr[0]) == 0) && \ -+(((a)->s6_addr[1]) == 0) && \ -+(((a)->s6_addr[2]) == 0) && \ -+(((a)->s6_addr[3]) == 0) && \ -+(((a)->s6_addr[4]) == 0) && \ -+(((a)->s6_addr[5]) == 0xFFFF)) -+#endif - - /** - * SECTION:gsocketaddress --- -2.25.1 - diff --git a/Ports/glib/patches/README.md b/Ports/glib/patches/README.md index 376142c643..3918a11443 100644 --- a/Ports/glib/patches/README.md +++ b/Ports/glib/patches/README.md @@ -60,16 +60,6 @@ Somehow we get a conflict with glib's mount function. This patch renames glib's - [X] Resolves issue(s) with our side of things - [X] Hack -## `0008-add-missing-macro-IN6_IS_ADDR_V4MAPPED.patch` - -Serenity lacks the macro 'IN6_IS_ADDR_V4MAPPED' so this patch adds such a macro. - -### Status -- [ ] Local? -- [ ] Should be merged to upstream? -- [X] Resolves issue(s) with our side of things -- [X] Hack - ## `0009-include-section-with-missing-functionality.patch` This includes a bigger section with functionality that Serenity is missing. |