From 615f6f50ceb0c2722b3b0053a7f1d4fd7a434d5f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Mon, 6 May 2024 13:29:29 +0200
Subject: [PATCH] lib/yajl: drop "yajl/" prefix from #include paths

According to the yajl API documentation, #include lines should have
the "yajl/" path prefix, but the actual pkg-config file contains:

 includedir=${dollar}{prefix}/include/yajl

.. which already contains this directory name, and thus the "yajl/"
prefix cannot work.  Unfortunately, the yajl project hasn't been
maintained for nearly 10 years, and there's little chance this bug
will ever be fixed.
---
 src/lib/yajl/Callbacks.hxx | 7 ++-----
 src/lib/yajl/Gen.hxx       | 7 ++-----
 src/lib/yajl/Handle.hxx    | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/lib/yajl/Callbacks.hxx b/src/lib/yajl/Callbacks.hxx
index 73039ebc9..f2bc9ffe3 100644
--- a/src/lib/yajl/Callbacks.hxx
+++ b/src/lib/yajl/Callbacks.hxx
@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef YAJL_CALLBACKS_HXX
-#define YAJL_CALLBACKS_HXX
+#pragma once
 
 #include "util/Cast.hxx"
 
 #include <string_view>
 
-#include <yajl/yajl_parse.h>
+#include <yajl_parse.h>
 
 namespace Yajl {
 
@@ -59,5 +58,3 @@ struct CallbacksWrapper {
 };
 
 } // namespace Yajl
-
-#endif
diff --git a/src/lib/yajl/Gen.hxx b/src/lib/yajl/Gen.hxx
index f19b0e806..84efdbcce 100644
--- a/src/lib/yajl/Gen.hxx
+++ b/src/lib/yajl/Gen.hxx
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef YAJL_GEN_HXX
-#define YAJL_GEN_HXX
+#pragma once
 
-#include <yajl/yajl_gen.h>
+#include <yajl_gen.h>
 
 #include <algorithm>
 #include <span>
@@ -74,5 +73,3 @@ public:
 };
 
 } // namespace Yajl
-
-#endif
diff --git a/src/lib/yajl/Handle.hxx b/src/lib/yajl/Handle.hxx
index 6ef0eb8fe..28e4fe942 100644
--- a/src/lib/yajl/Handle.hxx
+++ b/src/lib/yajl/Handle.hxx
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef YAJL_HANDLE_HXX
-#define YAJL_HANDLE_HXX
+#pragma once
 
-#include <yajl/yajl_parse.h>
+#include <yajl_parse.h>
 
 #include <utility>
 
@@ -56,5 +55,3 @@ private:
 };
 
 } // namespace Yajl
-
-#endif