Merge branch 'po/fix-ipv46-build' into 'master'

Fix compilation when using IpV4 or IpV6 specific configuration.

Closes #42

See merge request eng/toolchain/aws!45

Author: TurboGit

config/src/aws-net-std__ipv4.adb

@@ -65,11 +65,6 @@ package body AWS.Net.Std is
    --  Set the socket to the non-blocking mode.
    --  AWS is not using blocking sockets internally.
 
-   To_GNAT : constant array (Family_Type) of Sockets.Family_Type :=
-               (Family_Inet   => Sockets.Family_Inet,
-                Family_Inet6  => Sockets.Family_Inet6,
-                Family_Unspec => Sockets.Family_Inet);
-
    -------------------
    -- Accept_Socket --
    -------------------
@@ -143,8 +138,7 @@ package body AWS.Net.Std is
 
       Sockets.Bind_Socket
         (Socket.S.FD,
-         (To_GNAT (Family), Inet_Addr, Sockets.Port_Type (Port)));
-
+         (Sockets.Family_Inet, Inet_Addr, Sockets.Port_Type (Port)));
    exception
       when E : Sockets.Socket_Error | Sockets.Host_Error =>
          if Created then
@@ -210,7 +204,7 @@ package body AWS.Net.Std is
 
       Socket.S := new Socket_Hidden;
 
-      Sock_Addr := (To_GNAT (Family),
+      Sock_Addr := (Sockets.Family_Inet,
                     Get_Inet_Addr (Host, Passive => False),
                     Sockets.Port_Type (Port));
 

config/src/aws-net-std__ipv6.adb

@@ -919,9 +919,12 @@ package body AWS.Net.Std is
    -----------------------
 
    overriding procedure Set_Close_On_Exec (Socket : Socket_Type) is
-      Status : Boolean;
+      function C_Set_Close_On_Exec
+        (Socket : C.int; Close_On_Exec : C.int) return C.int;
+      pragma Import (C, C_Set_Close_On_Exec, "__gnat_set_close_on_exec");
+      Res : C.int := 0 with Unreferenced;
    begin
-      Sockets.Set_Close_On_Exec (Socket.S.FD, True, Status);
+      Res := C_Set_Close_On_Exec (Socket.S.FD, 1);
    end Set_Close_On_Exec;
 
    ----------------------