commit 42cb84fc4ea3ce9da7d42f185ba3135a3ea156cf
author Janos Follath <janos.follath@arm.com> Tue Dec 03 09:12:12 2024 +0000
committer GitHub <noreply@github.com> Tue Dec 03 09:12:12 2024 +0000
tree 2fd0ff0326019b1b863df141715e48903d31c3d9
parent 968ada439ba7835fae406a8078478d9d2caaab88
parent f36f405c05f5dfaf3ffa0569c6cf39252c8d0a45

Merge pull request #9812 from SuperIlu/mbedtls-3.6

Mbedtls 3.6: Fix compilation on MS-DOS DJGPP

ChangeLog.d/fix-compilation-with-djgpp.txt

diff --git a/ChangeLog.d/fix-compilation-with-djgpp.txt b/ChangeLog.d/fix-compilation-with-djgpp.txt
new file mode 100644
index 0000000..5b79fb6
--- /dev/null
+++ b/ChangeLog.d/fix-compilation-with-djgpp.txt
@@ -0,0 +1,2 @@
+Bugfix
+   * Fix compilation on MS-DOS DJGPP. Fixes #9813.

library/net_sockets.c

diff --git a/library/net_sockets.c b/library/net_sockets.c
index bd5c47b..1419c78 100644
--- a/library/net_sockets.c
+++ b/library/net_sockets.c
@@ -524,8 +524,8 @@
 #else
     struct timeval tv;
     tv.tv_sec  = usec / 1000000;
-#if defined(__unix__) || defined(__unix) || \
-    (defined(__APPLE__) && defined(__MACH__))
+#if (defined(__unix__) || defined(__unix) || \
+    (defined(__APPLE__) && defined(__MACH__))) && !defined(__DJGPP__)
     tv.tv_usec = (suseconds_t) usec % 1000000;
 #else
     tv.tv_usec = usec % 1000000;