History

test/libmpv_encode: minor adjustments for win32 build fix

Kacper Michajłow committed 2 years ago

Commit cd12e921 parent 4d564282 files · +12 −3Browse files

Showing the changes to test (2 of 2 files). Show all

Unified · Split

2 files
  1. test/libmpv_encode.c +10 −2
  2. test/meson.build +2 −1
test/libmpv_encode.c+10−2
@@ -20,9 +20,15 @@ · 19 unmodified lines
2020 #include <stdarg.h>
2121 #include <stdio.h>
2222 #include <stdlib.h>
23−#include <unistd.h>
2423 #include <string.h>
2524
25+#ifdef _WIN32
26+#include <sys/types.h>
27+#include <io.h>
28+#else
29+#include <unistd.h>
30+#endif
31+
2632 // Stolen from osdep/compiler.h
2733 #ifdef __GNUC__
2834 #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format(printf, a1, a2)))
@@ -97,6 +103,8 @@ static void check_output(int fd) · 68 unmodified lines
97103 puts("output file ok");
98104 }
99105
106+int mp_mkostemps(char *template, int suffixlen, int flags);
107+
100108 int main(int argc, char *argv[])
101109 {
102110 atexit(exit_cleanup);
@@ -108,7 +116,7 @@ int main(int argc, char *argv[]) · 5 unmodified lines
108116 int fd;
109117 {
110118 char path[] = "./testout.XXXXXX";
111− fd = mkstemp(path);
119+ fd = mp_mkostemps(path, 0, 0);
112120 if (fd == -1)
113121 fail("mkstemp failed");
114122 out_path = strdup(path);
test/meson.build+2−1
@@ -15,6 +15,7 @@ test_utils_files = [ · 14 unmodified lines
1515 'common/common.c',
1616 'misc/bstr.c',
1717 'misc/dispatch.c',
18+ 'misc/io_utils.c',
1819 'misc/json.c',
1920 'misc/node.c',
2021 'misc/path_utils.c',
@@ -124,7 +125,7 @@ if get_option('libmpv') · 103 unmodified lines
124125 test('libmpv', exe, args: file, timeout: 60)
125126
126127 exe = executable('libmpv-encode', 'libmpv_encode.c',
127− include_directories: incdir, link_with: libmpv)
128+ include_directories: incdir, link_with: [libmpv, test_utils])
128129 test('libmpv-encode', exe, timeout: 30)
129130 endif
130131

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t