File 2016-esock-Add-condition-ESOCK_USE_IFMAP-for-if... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2016-esock-Add-condition-ESOCK_USE_IFMAP-for-ifmap.patch of Package erlang (Revision de16d5bb9b1e73f72aa79d2ecdf361ff)

Currently displaying revision de16d5bb9b1e73f72aa79d2ecdf361ff , Show latest

From 209f508d817edc6e3b84a14c7432865b8698af42 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 27 Oct 2021 18:27:08 +0200
Subject: [PATCH 16/58] [esock] Add condition (ESOCK_USE_IFMAP) for ifmap

The ifmap does not exist for all platforms, for instance macOS.

OTP-17528
---
 erts/emulator/nifs/common/prim_socket_nif.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index aea2a05256..711c36e071 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -1936,7 +1936,7 @@ static ERL_NIF_TERM esock_ioctl_gifhwaddr(ErlNifEnv*       env,
 					  ESockDescriptor* descP,
 					  ERL_NIF_TERM     ename);
 #endif
-#if defined(SIOCGIFMAP)
+#if defined(SIOCGIFMAP) && defined(ESOCK_USE_IFMAP)
 static ERL_NIF_TERM esock_ioctl_gifmap(ErlNifEnv*       env,
 				       ESockDescriptor* descP,
 				       ERL_NIF_TERM     ename);
@@ -1950,7 +1950,7 @@ static ERL_NIF_TERM esock_ioctl_giftxqlen(ErlNifEnv*       env,
 					  ERL_NIF_TERM     ename);
 #endif
 
-#if defined(SIOCGIFMAP)
+#if defined(SIOCGIFMAP) && defined(ESOCK_USE_IFMAP)
 static ERL_NIF_TERM encode_ioctl_ifrmap(ErlNifEnv*       env,
 					ESockDescriptor* descP,
 					struct ifmap*    mapP);
@@ -5201,7 +5201,7 @@ ERL_NIF_TERM esock_supports_ioctl_requests(ErlNifEnv* env)
   requests = MKC(env, MKT2(env, atom_gifhwaddr, MKUL(env, SIOCGIFHWADDR)), requests);
 #endif
 
-#if defined(SIOCGIFMAP)
+#if defined(SIOCGIFMAP) && defined(ESOCK_USE_IFMAP)
   requests = MKC(env, MKT2(env, atom_gifmap, MKUL(env, SIOCGIFMAP)), requests);
 #endif
 
@@ -12963,7 +12963,7 @@ ERL_NIF_TERM esock_ioctl2(ErlNifEnv*       env,
     break;
 #endif
 
-#if defined(SIOCGIFMAP)
+#if defined(SIOCGIFMAP) && defined(ESOCK_USE_IFMAP)
   case SIOCGIFMAP:
     return esock_ioctl_gifmap(env, descP, arg);
     break;
@@ -13350,7 +13350,7 @@ ERL_NIF_TERM esock_ioctl_gifhwaddr(ErlNifEnv*       env,
 #endif
 
 
-#if defined(SIOCGIFMAP)
+#if defined(SIOCGIFMAP) && defined(ESOCK_USE_IFMAP)
 static
 ERL_NIF_TERM esock_ioctl_gifmap(ErlNifEnv*       env,
 				ESockDescriptor* descP,
-- 
2.31.1

Places

File 2016-esock-Add-condition-ESOCK_USE_IFMAP-for-ifmap.patch of Package erlang (Revision de16d5bb9b1e73f72aa79d2ecdf361ff)

Places