Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fsutils/libtinycbor: Update TinyCBOR to 0.6.1

Browse source 
Update the TinyCBOR serialization library to the latest 0.6.1 tagged release.

Signed-off-by: Niccolò Maggioni <nicco.maggioni+nuttx@gmail.com>
This commit is contained in:
Niccolò Maggioni 2025-08-12 20:36:01 +02:00 • committed by Xiang Xiao
parent 056f04d170
commit b0726955a0
2 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fsutils/libtinycbor/Makefile
View file

@ -23,7 +23,7 @@
include $(APPDIR)/Make.defs
TINYCBOR_URL ?= "https://github.com/intel/tinycbor/archive"
TINYCBOR_VERSION ?= 3cba6b11aaa0f6f674cd56ebaa573c4b65f71ee7
TINYCBOR_VERSION ?= c0aad2fb2137a31b9845fbaae3653540c410f215
TINYCBOR_UNPACKNAME = tinycbor
@ -51,6 +51,7 @@ CSRCS += tinycbor/cborvalidation.c
CSRCS += tinycbor/open_memstream.c
CFLAGS += -std=c99
CFLAGS += -DCBOR_NO_HALF_FLOAT_TYPE
clean::
$(call DELFILE, $(OBJS))

36
fsutils/libtinycbor/fix_open_memstream.patch
View file

@ -1,31 +1,33 @@
From a66a373a9417d3f481e9346286d93e33fac8e616 Mon Sep 17 00:00:00 2001
From: Lee Lup Yuen <luppy@appkaki.com>
Date: Wed, 5 Jan 2022 08:32:38 +0800
Subject: [PATCH] Fix open_memstream.c compilation
diff --git a/tinycbor/open_memstream.c b/tinycbor/open_memstream.c
index 3365378..37a0d08 100644
--- a/tinycbor/open_memstream.c
+++ b/tinycbor/open_memstream.c
@@ -32,7 +32,7 @@
@@ -32,13 +32,13 @@
#include <stdlib.h>
#include <string.h>
-#if defined(__unix__) || defined(__APPLE__)
+#if defined(__unix__) || defined(__APPLE__) || defined(__NuttX__)
# include <unistd.h>
#endif
#ifdef __APPLE__
@@ -41,6 +41,9 @@ typedef int LenType;
#elif __linux__
-#ifdef __APPLE__
+#if defined(__APPLE__)
typedef int RetType;
typedef int LenType;
-#elif __linux__
+#elif defined(__linux__) || defined(__NuttX__)
typedef ssize_t RetType;
typedef size_t LenType;
+#elif __NuttX__
+typedef ssize_t RetType;
+typedef size_t LenType;
#else
# error "Cannot implement open_memstream!"
#endif
--
2.34.1
@@ -99,9 +99,9 @@ FILE *open_memstream(char **bufptr, size_t *lenptr)
*bufptr = NULL;
*lenptr = 0;
-#ifdef __APPLE__
+#if defined(__APPLE__)
return funopen(b, NULL, write_to_buffer, NULL, close_buffer);
-#elif __linux__
+#elif defined(__linux__) || defined(__NuttX__)
static const cookie_io_functions_t vtable = {
NULL,
write_to_buffer,