Skip to content

Commit

Permalink
thirdparty: fix compilation of programs using miniz.h on macos
Browse files Browse the repository at this point in the history
  • Loading branch information
spytheman committed Sep 15, 2024
1 parent 5fcfc27 commit 26c560b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions cmd/tools/vtest-all.v
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,13 @@ fn get_all_commands() []Command {
rmfile: 'v.c'
}
}
$if linux || macos {
res << Command{
line: '${vexe} -gc none -no-retry-compilation -cc tcc -d use_openssl -showcc examples/veb/todo/main.v'
okmsg: 'A simple veb app, compiles with `-gc none -no-retry-compilation -cc tcc -d use_openssl` on macos and linux'
rmfile: 'examples/veb/todo/main'
}
}
$if linux {
res << Command{
line: '${vexe} vlib/v/tests/bench/bench_stbi_load.v && prlimit -v10485760 vlib/v/tests/bench/bench_stbi_load'
Expand Down
4 changes: 2 additions & 2 deletions thirdparty/zip/miniz.h
Original file line number Diff line number Diff line change
Expand Up @@ -5026,7 +5026,7 @@ static int mz_mkdir(const char *pDirname) {
}

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

#elif defined(__TINYC__)
#ifndef MINIZ_NO_TIME
#if (defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
#if ( defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
#include <utime.h>
#else
#include <sys/utime.h>
Expand Down

0 comments on commit 26c560b

Please sign in to comment.