various: reduce the include scope of some public headers

Kacper Michajłow committed 1 year ago

Commit 77313f71 parent b848ffa16 files · +30 −24Browse files

Unified · Split

16 files

@@ -23,8 +23,6 @@ · 22 unmodified lines
23	23	#include <sys/mman.h>
24	24	#include <unistd.h>
25	25
26		−#include <libmpv/client.h>
27		−
28	26	#include "common.h"
29	27
30	28	int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)

@@ -20,8 +20,6 @@ · 19 unmodified lines
20	20
21	21	#include <unistd.h>
22	22
23		−#include <libmpv/client.h>
24		−
25	23	#include "common.h"
26	24
27	25	int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)

@@ -15,8 +15,6 @@ · 14 unmodified lines
15	15	* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17	17
18		−#include <libmpv/client.h>
19		−
20	18	#include "common.h"
21	19
22	20	int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)

@@ -15,6 +15,8 @@ · 14 unmodified lines
15	15	* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
16	16	*/
17	17
	18	+#include <libmpv/client.h>
	19	+
18	20	#include "common/msg.h"
19	21	#include "input/input.h"
20	22	#include "misc/json.h"

@@ -18,12 +18,10 @@ · 17 unmodified lines
18	18	#ifndef MP_JSON_H
19	19	#define MP_JSON_H
20	20
21		−// We reuse mpv_node.
22		−#include "libmpv/client.h"
23		−
24	21	#define MAX_JSON_DEPTH 50
25	22
26	23	struct bstr;
	24	+struct mpv_node;
27	25
28	26	int json_parse(void ta_parent, struct mpv_node dst, char **src, int max_depth);
29	27	int json_append(struct bstr b, const struct mpv_node src, int indent);

@@ -1,7 +1,10 @@
1		−#include "common/common.h"
2		−
3	1	#include "node.h"
4	2
	3	+#include <libmpv/client.h>
	4	+
	5	+#include "common/common.h"
	6	+#include "bstr.h"
	7	+
5	8	// Init a node with the given format. If parent is not NULL, it is set as
6	9	// parent allocation according to m_option_type_node rules (which means
7	10	// the mpv_node_list allocs are used for chaining the TA allocations).
@@ -117,7 +120,7 @@ mpv_node node_map_bget(mpv_node src, struct bstr key) · 109 unmodified lines
117	120
118	121	// Note: for MPV_FORMAT_NODE_MAP, this (incorrectly) takes the order into
119	122	// account, instead of treating it as set.
120		−bool equal_mpv_value(const void a, const void b, mpv_format format)
	123	+bool equal_mpv_value(const void a, const void b, int format)
121	124	{
122	125	switch (format) {
123	126	case MPV_FORMAT_NONE:

@@ -1,21 +1,24 @@
1	1	#ifndef MP_MISC_NODE_H_
2	2	#define MP_MISC_NODE_H_
3	3
4		−#include "libmpv/client.h"
5		−#include "misc/bstr.h"
	4	+#include <stdbool.h>
	5	+#include <stdint.h>
	6	+
	7	+struct bstr;
	8	+struct mpv_node;
6	9
7	10	void node_init(struct mpv_node dst, int format, struct mpv_node parent);
8	11	struct mpv_node node_array_add(struct mpv_node dst, int format);
9	12	struct mpv_node node_map_add(struct mpv_node dst, const char *key, int format);
10	13	struct mpv_node node_map_badd(struct mpv_node dst, struct bstr key, int format);
11	14	void node_map_add_string(struct mpv_node dst, const char key, const char *val);
12		−void node_map_add_bstr(struct mpv_node dst, const char key, bstr val);
	15	+void node_map_add_bstr(struct mpv_node dst, const char key, struct bstr val);
13	16	void node_map_add_int64(struct mpv_node dst, const char key, int64_t v);
14	17	void node_map_add_double(struct mpv_node dst, const char key, double v);
15	18	void node_map_add_flag(struct mpv_node dst, const char key, bool v);
16		−mpv_node node_map_get(mpv_node src, const char *key);
17		−mpv_node node_map_bget(mpv_node src, struct bstr key);
18		−bool equal_mpv_value(const void a, const void b, mpv_format format);
	19	+struct mpv_node node_map_get(struct mpv_node src, const char *key);
	20	+struct mpv_node node_map_bget(struct mpv_node src, struct bstr key);
	21	+bool equal_mpv_value(const void a, const void b, int format);
19	22	bool equal_mpv_node(const struct mpv_node a, const struct mpv_node b);
20	23
21	24	#endif

@@ -21,8 +21,6 @@ · 20 unmodified lines
21	21	#include <stdatomic.h>
22	22	#include <stdbool.h>
23	23
24		−#include "libmpv/client.h"
25		−
26	24	#include "audio/aframe.h"
27	25	#include "clipboard/clipboard.h"
28	26	#include "common/common.h"

@@ -60,7 +60,6 @@ · 59 unmodified lines
60	60
61	61	#include "core.h"
62	62	#include "command.h"
63		−#include "libmpv/client.h"
64	63
65	64	// Called from the demuxer thread if a new packet is available, or other changes.
66	65	static void wakeup_demux(void *pctx)

@@ -16,13 +16,14 @@ · 15 unmodified lines
16	16	*/
17	17
18	18	#include <inttypes.h>
19		−#include <libmpv/client.h>
20	19	#include <stdarg.h>
21	20	#include <stdbool.h>
22	21	#include <stdio.h>
23	22	#include <stdlib.h>
24	23	#include <string.h>
25	24
	25	+#include <libmpv/client.h>
	26	+
26	27	// Stolen from osdep/compiler.h
27	28	#ifdef __GNUC__
28	29	#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format(printf, a1, a2)))

@@ -16,7 +16,6 @@ · 15 unmodified lines
16	16	*/
17	17
18	18	#include <inttypes.h>
19		−#include <libmpv/client.h>
20	19	#include <stdarg.h>
21	20	#include <stdio.h>
22	21	#include <stdlib.h>
@@ -29,6 +28,8 @@ · 6 unmodified lines
29	28	#include <unistd.h>
30	29	#endif
31	30
	31	+#include <libmpv/client.h>
	32	+
32	33	// Stolen from osdep/compiler.h
33	34	#ifdef __GNUC__
34	35	#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format(printf, a1, a2)))

Keyboard shortcuts