diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2021-11-30 09:31:49 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2021-11-30 09:31:49 +0000 |
| commit | 05cc895444e58bdd2d83a1aeb3eee978c377d2c2 (patch) | |
| tree | 6ddd89c60e68f8d2bb5d0c7671d824101ecc526c | |
| parent | 0873ca6fb9178e94e61b819873a34e1163ed5847 (diff) | |
| parent | 63f65307508a82e64d78453ddba8acf7715e8f07 (diff) | |
| download | dbus-05cc895444e58bdd2d83a1aeb3eee978c377d2c2.tar.gz | |
Merge branch 'issue-355' into 'master'
Fix MinGW build error
Closes #355
See merge request dbus/dbus!226
| -rw-r--r-- | dbus/dbus-sysdeps-win.c | 2 | ||||
| -rwxr-xr-x | tools/ci-build.sh | 2 | ||||
| -rwxr-xr-x | tools/ci-install.sh | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 32126bbc..e9de9340 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -126,7 +126,7 @@ load_ex_ip_helper_procedures(void) return FALSE; } - lpfnAllocateAndGetTcpExTableFromStack = (ProcAllocateAndGetTcpExtTableFromStack)GetProcAddress (hModule, "AllocateAndGetTcpExTableFromStack"); + lpfnAllocateAndGetTcpExTableFromStack = (ProcAllocateAndGetTcpExtTableFromStack) (void (*)(void))GetProcAddress (hModule, "AllocateAndGetTcpExTableFromStack"); if (lpfnAllocateAndGetTcpExTableFromStack == NULL) { _dbus_verbose ("could not find function AllocateAndGetTcpExTableFromStack in iphlpapi.dll\n"); diff --git a/tools/ci-build.sh b/tools/ci-build.sh index f77f11c2..856a65a8 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -130,6 +130,8 @@ init_wine() { # One of static, shared; used for windows cross builds : "${ci_runtime:=static}" +echo "ci_buildsys=$ci_buildsys ci_distro=$ci_distro ci_docker=$ci_docker ci_host=$ci_host ci_local_packages=$ci_local_packages ci_parallel=$ci_parallel ci_suite=$ci_suite ci_test=$ci_test ci_test_fatal=$ci_test_fatal ci_variant=$ci_variant ci_runtime=$ci_runtime $0" + if [ -n "$ci_docker" ]; then exec docker run \ --env=ci_buildsys="${ci_buildsys}" \ diff --git a/tools/ci-install.sh b/tools/ci-install.sh index d6c8246f..5b3b1b2f 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -62,6 +62,8 @@ NULL= # One of debug, reduced, legacy, production : "${ci_variant:=production}" +echo "ci_distro=$ci_distro ci_docker=$ci_docker ci_in_docker=$ci_in_docker ci_host=$ci_host ci_local_packages=$ci_local_packages ci_suite=$ci_suite ci_variant=$ci_variant $0" + if [ $(id -u) = 0 ]; then sudo= else |