[Scummvm-git-logs] scummvm master -> 57f3d6ebf3e85c6a6b19fe02bee8274127bbdbc7

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e51b9a7325 BACKENDS: ENET: Fix Vita build
57f3d6ebf3 BACKENDS: ENET: Fix AmigaOS build


Commit: e51b9a7325331aeb663a71bae7b3332ab60c7bb6
    https://github.com/scummvm/scummvm/commit/e51b9a7325331aeb663a71bae7b3332ab60c7bb6
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-03-07T08:41:30+01:00

Commit Message:
BACKENDS: ENET: Fix Vita build

fcntl is supported here while ioctl isn't.

Changed paths:
    backends/networking/enet/source/unix.cpp


diff --git a/backends/networking/enet/source/unix.cpp b/backends/networking/enet/source/unix.cpp
index bd5083fa817..05b04977808 100644
--- a/backends/networking/enet/source/unix.cpp
+++ b/backends/networking/enet/source/unix.cpp
@@ -6,7 +6,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/time.h>
 #include <netinet/tcp.h>
 #include <netdb.h>
@@ -47,6 +46,8 @@
 
 #ifdef HAS_FCNTL
 #include <fcntl.h>
+#else
+#include <sys/ioctl.h>
 #endif
 
 #ifdef HAS_POLL


Commit: 57f3d6ebf3e85c6a6b19fe02bee8274127bbdbc7
    https://github.com/scummvm/scummvm/commit/57f3d6ebf3e85c6a6b19fe02bee8274127bbdbc7
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-03-07T08:41:30+01:00

Commit Message:
BACKENDS: ENET: Fix AmigaOS build

There, msg_name is of type char *

Changed paths:
    backends/networking/enet/source/unix.cpp


diff --git a/backends/networking/enet/source/unix.cpp b/backends/networking/enet/source/unix.cpp
index 05b04977808..ffc0efdbfb3 100644
--- a/backends/networking/enet/source/unix.cpp
+++ b/backends/networking/enet/source/unix.cpp
@@ -448,7 +448,11 @@ enet_socket_send (ENetSocket socket,
         sin.sin_port = ENET_HOST_TO_NET_16 (address -> port);
         sin.sin_addr.s_addr = address -> host;
 
+#ifdef AMIGAOS
+        msgHdr.msg_name = (char *)& sin;
+#else
         msgHdr.msg_name = & sin;
+#endif
         msgHdr.msg_namelen = sizeof (struct sockaddr_in);
     }