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.
This commit is contained in:
src/lib/yajl
@ -27,13 +27,12 @@
|
|||||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef YAJL_CALLBACKS_HXX
|
#pragma once
|
||||||
#define YAJL_CALLBACKS_HXX
|
|
||||||
|
|
||||||
#include "util/Cast.hxx"
|
#include "util/Cast.hxx"
|
||||||
#include "util/StringView.hxx"
|
#include "util/StringView.hxx"
|
||||||
|
|
||||||
#include <yajl/yajl_parse.h>
|
#include <yajl_parse.h>
|
||||||
|
|
||||||
namespace Yajl {
|
namespace Yajl {
|
||||||
|
|
||||||
@ -81,5 +80,3 @@ struct CallbacksWrapper {
|
|||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Yajl
|
} // namespace Yajl
|
||||||
|
|
||||||
#endif
|
|
||||||
|
@ -27,12 +27,11 @@
|
|||||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef YAJL_GEN_HXX
|
#pragma once
|
||||||
#define YAJL_GEN_HXX
|
|
||||||
|
|
||||||
#include "util/ConstBuffer.hxx"
|
#include "util/ConstBuffer.hxx"
|
||||||
|
|
||||||
#include <yajl/yajl_gen.h>
|
#include <yajl_gen.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
@ -101,5 +100,3 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Yajl
|
} // namespace Yajl
|
||||||
|
|
||||||
#endif
|
|
||||||
|
@ -27,10 +27,9 @@
|
|||||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef YAJL_HANDLE_HXX
|
#pragma once
|
||||||
#define YAJL_HANDLE_HXX
|
|
||||||
|
|
||||||
#include <yajl/yajl_parse.h>
|
#include <yajl_parse.h>
|
||||||
|
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
@ -82,5 +81,3 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Yajl
|
} // namespace Yajl
|
||||||
|
|
||||||
#endif
|
|
||||||
|
Reference in New Issue
Block a user