openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 21:24:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

libroxml: fix compilation with GCC14

Browse Source 
Need casts for integer conversion

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2024-05-14 21:16:43 -07:00
parent 206752dd9c
commit d5f9a76aa4
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/libroxml/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libroxml PKG_NAME:=libroxml
PKG_VERSION:=3.0.2 PKG_VERSION:=3.0.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download.libroxml.net/pool/v3.x PKG_SOURCE_URL:=http://download.libroxml.net/pool/v3.x

31
libs/libroxml/patches/020-gcc14.patch Normal file
View File

@@ -0,0 +1,31 @@
--- a/src/roxml_mem.c
+++ b/src/roxml_mem.c
@@ -20,7 +20,7 @@ ROXML_STATIC ROXML_INT inline void roxml
memory_cell_t *ptr = &head_cell;
memory_cell_t *to_delete = NULL;
- while ((ptr->prev != NULL) && (ptr->prev->id != pthread_self()))
+ while ((ptr->prev != NULL) && (ptr->prev->id != (unsigned long int)pthread_self()))
ptr = ptr->prev;
if (ptr->prev == NULL)
@@ -135,7 +135,7 @@ ROXML_INT void *roxml_malloc(int size, i
cell->next->prev = cell;
cell = cell->next;
cell->type = type;
- cell->id = pthread_self();
+ cell->id = (unsigned long int)pthread_self();
cell->occ = size;
cell->ptr = calloc(num, size);
head_cell.prev = cell;
--- a/src/roxml_utils.h
+++ b/src/roxml_utils.h
@@ -48,7 +48,7 @@ ROXML_STATIC_INLINE ROXML_INT int roxml_
#else /* CONFIG_XML_THREAD_SAFE==1 */
ROXML_STATIC_INLINE ROXML_INT unsigned long int roxml_thread_id(node_t *n)
{
- return pthread_self();
+ return (unsigned long int)pthread_self();
}
ROXML_STATIC_INLINE ROXML_INT int roxml_lock_init(node_t *n)