Skip to content

Commit 26c560b

Browse files
committed
thirdparty: fix compilation of programs using miniz.h on macos
1 parent 5fcfc27 commit 26c560b

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

cmd/tools/vtest-all.v

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,13 @@ fn get_all_commands() []Command {
402402
rmfile: 'v.c'
403403
}
404404
}
405+
$if linux || macos {
406+
res << Command{
407+
line: '${vexe} -gc none -no-retry-compilation -cc tcc -d use_openssl -showcc examples/veb/todo/main.v'
408+
okmsg: 'A simple veb app, compiles with `-gc none -no-retry-compilation -cc tcc -d use_openssl` on macos and linux'
409+
rmfile: 'examples/veb/todo/main'
410+
}
411+
}
405412
$if linux {
406413
res << Command{
407414
line: '${vexe} vlib/v/tests/bench/bench_stbi_load.v && prlimit -v10485760 vlib/v/tests/bench/bench_stbi_load'

thirdparty/zip/miniz.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5026,7 +5026,7 @@ static int mz_mkdir(const char *pDirname) {
50265026
}
50275027

50285028
#ifndef MINIZ_NO_TIME
5029-
#if (defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
5029+
#if ( defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
50305030
#include <utime.h>
50315031
#else
50325032
#include <sys/utime.h>
@@ -5073,7 +5073,7 @@ static int mz_mkdir(const char *pDirname) {
50735073

50745074
#elif defined(__TINYC__)
50755075
#ifndef MINIZ_NO_TIME
5076-
#if (defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
5076+
#if ( defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
50775077
#include <utime.h>
50785078
#else
50795079
#include <sys/utime.h>

0 commit comments

Comments
 (0)