Skip to content

Commit

Permalink
demux_edl: rename ebml_defs.c to ebml_defs.inc
Browse files Browse the repository at this point in the history
The extension is completely arbitrary since ebml_defs.c isn't a real c
file that actually is compiled at any point in time. It's just used as
an include. The reason for changing the extension is because meson needs
to add this to its list of sources for dependency/ordering purposes.
Understandably, meson will try to compile any .c file added to a c
project executable object. Obviously, this compilation will never
succeed, and this shouldn't be compiled anyways. Just make it .inc
instead.
  • Loading branch information
Dudemanguy committed Nov 14, 2021
1 parent 94950b1 commit f610fe1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion demux/ebml.c
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ int ebml_resync_cluster(struct mp_log *log, stream_t *s)
#define E_S(str, count) EVALARGS(E_SN, str, count, N)
#define FN(id, name, multiple, N) { id, multiple, offsetof(struct ebml_ ## N, name), offsetof(struct ebml_ ## N, n_ ## name), &ebml_##name##_desc},
#define F(id, name, multiple) EVALARGS(FN, id, name, multiple, N)
#include "generated/ebml_defs.c"
#include "generated/ebml_defs.inc"
#undef EVALARGS
#undef SN
#undef S
Expand Down
2 changes: 1 addition & 1 deletion wscript_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def build(ctx):
target = "generated/wayland/xdg-decoration-unstable-v1.h")

ctx(features = "ebml_header", target = "generated/ebml_types.h")
ctx(features = "ebml_definitions", target = "generated/ebml_defs.c")
ctx(features = "ebml_definitions", target = "generated/ebml_defs.inc")

def swift(task):
src = [x.abspath() for x in task.inputs]
Expand Down

0 comments on commit f610fe1

Please sign in to comment.