Skip to content

Commit 0aeda01

Browse files
committed
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.
1 parent 3798d11 commit 0aeda01

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

src/lib/yajl/Callbacks.hxx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@
2727
* OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*/
2929

30-
#ifndef YAJL_CALLBACKS_HXX
31-
#define YAJL_CALLBACKS_HXX
30+
#pragma once
3231

3332
#include "util/Cast.hxx"
3433
#include "util/StringView.hxx"
3534

36-
#include <yajl/yajl_parse.h>
35+
#include <yajl_parse.h>
3736

3837
namespace Yajl {
3938

@@ -81,5 +80,3 @@ struct CallbacksWrapper {
8180
};
8281

8382
} // namespace Yajl
84-
85-
#endif

src/lib/yajl/Gen.hxx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@
2727
* OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*/
2929

30-
#ifndef YAJL_GEN_HXX
31-
#define YAJL_GEN_HXX
30+
#pragma once
3231

3332
#include "util/ConstBuffer.hxx"
3433

35-
#include <yajl/yajl_gen.h>
34+
#include <yajl_gen.h>
3635

3736
#include <algorithm>
3837
#include <string_view>
@@ -101,5 +100,3 @@ public:
101100
};
102101

103102
} // namespace Yajl
104-
105-
#endif

src/lib/yajl/Handle.hxx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@
2727
* OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*/
2929

30-
#ifndef YAJL_HANDLE_HXX
31-
#define YAJL_HANDLE_HXX
30+
#pragma once
3231

33-
#include <yajl/yajl_parse.h>
32+
#include <yajl_parse.h>
3433

3534
#include <utility>
3635

@@ -82,5 +81,3 @@ private:
8281
};
8382

8483
} // namespace Yajl
85-
86-
#endif

0 commit comments

Comments
 (0)