aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/linux.yml5
-rw-r--r--crypto/compat/posix_win.c2
-rwxr-xr-xupdate.sh2
3 files changed, 3 insertions, 6 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0c9a699..4d97432 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -22,13 +22,10 @@ jobs:
22 strategy: 22 strategy:
23 fail-fast: false 23 fail-fast: false
24 matrix: 24 matrix:
25 os: ["ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04"] 25 os: ["ubuntu-22.04", "ubuntu-24.04"]
26 arch: ["native", "arm32", "arm64", "mingw32", "mingw64", "mips64"] 26 arch: ["native", "arm32", "arm64", "mingw32", "mingw64", "mips64"]
27 compiler: ["gcc"] 27 compiler: ["gcc"]
28 include: 28 include:
29 - os: "ubuntu-20.04"
30 arch: "native"
31 compiler: "clang"
32 - os: "ubuntu-22.04" 29 - os: "ubuntu-22.04"
33 arch: "native" 30 arch: "native"
34 compiler: "clang" 31 compiler: "clang"
diff --git a/crypto/compat/posix_win.c b/crypto/compat/posix_win.c
index bed8c84..1fbfce1 100644
--- a/crypto/compat/posix_win.c
+++ b/crypto/compat/posix_win.c
@@ -291,7 +291,7 @@ uid_t getuid(void)
291 291
292#ifdef _MSC_VER 292#ifdef _MSC_VER
293struct timezone; 293struct timezone;
294int gettimeofday(struct timeval * tp, struct timezone * tzp) 294int gettimeofday(struct timeval *tp, void *tzp)
295{ 295{
296 /* 296 /*
297 * Note: some broken versions only have 8 trailing zero's, the correct 297 * Note: some broken versions only have 8 trailing zero's, the correct
diff --git a/update.sh b/update.sh
index 2948e0f..e14425d 100755
--- a/update.sh
+++ b/update.sh
@@ -6,7 +6,7 @@ openbsd_branch=`cat OPENBSD_BRANCH`
6# pull in latest upstream code 6# pull in latest upstream code
7echo "pulling upstream openbsd source" 7echo "pulling upstream openbsd source"
8if [ ! -d openbsd ]; then 8if [ ! -d openbsd ]; then
9 LIBRESSL_GIT_OPTIONS="${LIBRESSL_GIT_OPTIONS:- --depth=8}" 9 #LIBRESSL_GIT_OPTIONS="${LIBRESSL_GIT_OPTIONS:- --depth=8}"
10 LIBRESSL_GIT="${LIBRESSL_GIT:- https://github.com/libressl}" 10 LIBRESSL_GIT="${LIBRESSL_GIT:- https://github.com/libressl}"
11 git clone $LIBRESSL_GIT_OPTIONS $LIBRESSL_GIT/openbsd 11 git clone $LIBRESSL_GIT_OPTIONS $LIBRESSL_GIT/openbsd
12fi 12fi