From bcf7d6234299053b71865723cf98141ef0d6bf75 Mon Sep 17 00:00:00 2001 From: Jon Shallow Date: Tue, 20 May 2025 11:32:23 +0100 Subject: [PATCH] RIOT: Fix building RIOT with RIOT's utlist.h change --- examples/riot/pkg_libcoap/Makefile | 2 +- include/coap3/coap_utlist_internal.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/riot/pkg_libcoap/Makefile b/examples/riot/pkg_libcoap/Makefile index 450648a0..f89994ae 100644 --- a/examples/riot/pkg_libcoap/Makefile +++ b/examples/riot/pkg_libcoap/Makefile @@ -1,6 +1,6 @@ PKG_NAME=libcoap PKG_URL=https://github.com/obgm/libcoap -PKG_VERSION=0d240530b4beba90cc86c488e17bd0090437a0dd +PKG_VERSION=7cf7465b784baded4de183290c547d582becfd28 PKG_LICENSE=BSD-2-Clause LIBCOAP_BUILD_DIR=$(BINDIR)/pkg/$(PKG_NAME) diff --git a/include/coap3/coap_utlist_internal.h b/include/coap3/coap_utlist_internal.h index 1979448a..704c2f2c 100644 --- a/include/coap3/coap_utlist_internal.h +++ b/include/coap3/coap_utlist_internal.h @@ -21,6 +21,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef RIOT_VERSION #ifndef UTLIST_H #define UTLIST_H @@ -1071,3 +1072,4 @@ do { #endif /* NO_DECLTYPE */ #endif /* UTLIST_H */ +#endif /* ! RIOT_VERSION */