From: Futaura <oliver@futaura.co.uk>
Date: Wed, 19 Jul 2023 18:58:44 +0000 (+0100)
Subject: amigaos: fix sys/mbuf.h m_len macro clash
X-Git-Tag: curl-8_2_1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ea44fca25bb9e2e3c8478194af5b353286a90c5;p=thirdparty%2Fcurl.git

amigaos: fix sys/mbuf.h m_len macro clash

The updated Curl_http_req_make and Curl_http_req_make2 functions spawned
a parameter called m_len. The AmigaOS networking headers, derived from
NetBSD, contain "#define m_len m_hdr.mh_len" which clashes with
this. Since we do not actually use mbuf, force the include file to be
ignored, removing the clash.

Closes #11479
---

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 727d123e5a..81c4bd12b7 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -298,6 +298,7 @@
 #  if defined(HAVE_PROTO_BSDSOCKET_H) && \
     (!defined(__amigaos4__) || defined(USE_AMISSL))
      /* use bsdsocket.library directly, instead of libc networking functions */
+#    define _SYS_MBUF_H /* m_len define clashes with curl */
 #    include <proto/bsdsocket.h>
 #    ifdef __amigaos4__
        int Curl_amiga_select(int nfds, fd_set *readfds, fd_set *writefds,