From 0aeda01ba6d22a8d9fc583faa67ffc6473869a43 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 643c3a0cd..0fde0fcf8 100644
--- a/src/lib/yajl/Callbacks.hxx
+++ b/src/lib/yajl/Callbacks.hxx
@@ -27,13 +27,12 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef YAJL_CALLBACKS_HXX
-#define YAJL_CALLBACKS_HXX
+#pragma once
 
 #include "util/Cast.hxx"
 #include "util/StringView.hxx"
 
-#include <yajl/yajl_parse.h>
+#include <yajl_parse.h>
 
 namespace Yajl {
 
@@ -81,5 +80,3 @@ struct CallbacksWrapper {
 };
 
 } // namespace Yajl
-
-#endif
diff --git a/src/lib/yajl/Gen.hxx b/src/lib/yajl/Gen.hxx
index 14ea7ec7e..f7a88e187 100644
--- a/src/lib/yajl/Gen.hxx
+++ b/src/lib/yajl/Gen.hxx
@@ -27,12 +27,11 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef YAJL_GEN_HXX
-#define YAJL_GEN_HXX
+#pragma once
 
 #include "util/ConstBuffer.hxx"
 
-#include <yajl/yajl_gen.h>
+#include <yajl_gen.h>
 
 #include <algorithm>
 #include <string_view>
@@ -101,5 +100,3 @@ public:
 };
 
 } // namespace Yajl
-
-#endif
diff --git a/src/lib/yajl/Handle.hxx b/src/lib/yajl/Handle.hxx
index 6b87883ba..abd5989e0 100644
--- a/src/lib/yajl/Handle.hxx
+++ b/src/lib/yajl/Handle.hxx
@@ -27,10 +27,9 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef YAJL_HANDLE_HXX
-#define YAJL_HANDLE_HXX
+#pragma once
 
-#include <yajl/yajl_parse.h>
+#include <yajl_parse.h>
 
 #include <utility>
 
@@ -82,5 +81,3 @@ private:
 };
 
 } // namespace Yajl
-
-#endif