]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
amigaos: fix sys/mbuf.h m_len macro clash
authorFutaura <oliver@futaura.co.uk>
Wed, 19 Jul 2023 18:58:44 +0000 (19:58 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 20 Jul 2023 21:41:00 +0000 (23:41 +0200)
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

lib/curl_setup.h

index 727d123e5aa5b18075bc8cb7423b7f09418e26de..81c4bd12b7ddfb9c7ef1f99e143e9105bcd37f03 100644 (file)
 #  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,