Fix channelapp code with newer versions of mxml

Fields became private. They need to be accessed using public methods.
This commit is contained in:
Joshua Peisach
2024-05-22 17:29:12 -04:00
parent 31da4b82ba
commit b94ef47d73
2 changed files with 4 additions and 22 deletions

View File

@@ -32,18 +32,15 @@ static inline char *_xmldup(const char *str) {
return pstrdup(str);
}
static char *_get_cdata(struct mxml_node_t *node) {
static char *_get_cdata(mxml_node_t* node) {
if (!node)
return NULL;
/*
'invalid use of incomplete typedef 'mxml_node_t'
*/
struct mxml_node_t *n = *node->child;
mxml_node_t *n = mxmlGetFirstChild(node);
while (n) {
if (n->type == MXML_OPAQUE)
return n->value.opaque;
if (mxmlGetType(n) == MXML_OPAQUE)
return mxmlGetOpaque(n);
n = mxmlWalkNext(n, node, MXML_NO_DESCEND);
}

View File

@@ -9,21 +9,6 @@
#include "font.h"
/*
* struct mxml_node_s /**** An XML node. @private@ ****/
// {
// mxml_type_t type; /* Node type */
// struct mxml_node_s *next; /* Next node under same parent */
// struct mxml_node_s *prev; /* Previous node under same parent */
// struct mxml_node_s *parent; /* Parent node */
// struct mxml_node_s *child; /* First child node */
// struct mxml_node_s *last_child; /* Last child node */
// mxml_value_t value; /* Node value */
// int ref_count; /* Use count */
// void *user_data; /* User data */
// };
#define NO_COLOR 0x0DEADF00
typedef struct {