File 0430-Remove-test-code-that-fails-on-Windows.patch of Package erlang

From 3710a7c4751781bd09ae520635ebf53f293f96da Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Wed, 3 Jul 2019 11:03:28 +0200
Subject: [PATCH 1/2] Remove test code that fails on Windows

---
 erts/emulator/drivers/common/inet_drv.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 1bf6f9f1af..972800ba6f 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -12715,7 +12715,7 @@ static void packet_inet_command(ErlDrvData e, char* buf, ErlDrvSizeT len)
         len -= 4; ptr += 4;
         if (len < anc_len) goto return_einval;
 
-        if (anc_len == 0 && !!0/*XXX-short-circuit-for-testing*/) {
+        if (anc_len == 0) {
             /* Empty ancillary data */
             /* Now "ptr" is the user data ptr, "len" is data length: */
             inet_output_count(desc, len);
@@ -12754,10 +12754,7 @@ static void packet_inet_command(ErlDrvData e, char* buf, ErlDrvSizeT len)
             if (compile_ancillary_data(&mhdr, ptr, anc_len) != 0) {
                 goto return_einval;
             }
-            if (mhdr.msg_controllen == 0) {
-                /* XXX Testing - only possible for anc_len == 0 */
-                mhdr.msg_control = NULL;
-            }
+            ASSERT(mhdr.msg_controllen != 0);
             len -= anc_len;
             ptr += anc_len;
             /* Now "ptr" is the user data ptr, "len" is data length: */
-- 
2.16.4

openSUSE Build Service is sponsored by