Merge branch 'develop'

Juniper · Apr 19, 2024 · 3b46d5f · 3b46d5f
2 parents eab1818 + b2fea5d
commit 3b46d5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/libxo/xo_xparse.c b/libxo/xo_xparse.c
@@ -17,9 +17,9 @@
 #include <assert.h>
 #include <sys/param.h>
 
-#include <libxo/xo.h>
-#include <libxo/xo_encoder.h>
-#include <libxo/xo_buf.h>
+#include "xo.h"
+#include "xo_encoder.h"
+#include "xo_buf.h"
 
 #include "xo_xpath.tab.h"
 #include "xo_xparse.h"
@@ -742,7 +742,7 @@ xo_xparse_results (xo_xparse_data_t *xdp, xo_xparse_node_id_t id)
     }
 
     uint32_t deny_count = 0, abs_count = 0;
-    xo_xparse_node_id_t i;
+    uint32_t i;
     xo_xparse_node_id_t *paths = xdp->xd_paths;
 
     /*
@@ -753,7 +753,7 @@ xo_xparse_results (xo_xparse_data_t *xdp, xo_xparse_node_id_t id)
      * all nots: !one | !two | !three
      * all abs:  /one | /two | /three
      */
-    xo_xparse_node_id_t cur = xdp->xd_paths_cur;
+    uint32_t cur = xdp->xd_paths_cur;
     for (i = 0; i < cur; i++, paths++) {
 	xnp = xo_xparse_node(xdp, *paths);
 	if (xnp == NULL)

diff --git a/libxo/xo_xpath.y b/libxo/xo_xpath.y
@@ -159,7 +159,6 @@
 #include <ctype.h>
 #include <wctype.h>
 #include <getopt.h>
-#include <langinfo.h>
 
 #include "xo_config.h"
 #include "xo.h"
@@ -213,6 +212,7 @@
 
 #define yytname xo_xpath_yyname
 #define yypact xo_xpath_yydefred
+#define yydebug xo_xpath_yydebug
 
 /*
  * Even if we don't want debug printfs, we still need the arrays with