27c9d80f51
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
From 53a89bfd86fff1a00cc77cabb8457a03eaa3bc7d Mon Sep 17 00:00:00 2001
|
|
From: Gabi Falk <gabifalk@gmx.com>
|
|
Date: Fri, 10 May 2024 14:36:12 +0000
|
|
Subject: [PATCH] bridge/vlan.c: bridge/vlan.c: fix build with gcc 14 on musl
|
|
systems
|
|
|
|
On glibc based systems the definition of 'struct timeval' is pulled in
|
|
with inclusion of <stdlib.h> header, but on musl based systems it
|
|
doesn't work this way. Missing definition triggers an
|
|
incompatible-pointer-types error with gcc 14 (warning on previous
|
|
versions of gcc):
|
|
|
|
../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
|
|
80 | _PRINT_FUNC(tv, const struct timeval *)
|
|
| ^~~~~~~
|
|
../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC'
|
|
50 | type value); \
|
|
| ^~~~
|
|
../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
|
|
80 | _PRINT_FUNC(tv, const struct timeval *)
|
|
| ^~~~~~~
|
|
../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC'
|
|
55 | type value) \
|
|
| ^~~~
|
|
../include/json_print.h: In function 'print_tv':
|
|
../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types]
|
|
58 | value); \
|
|
| ^~~~~
|
|
| |
|
|
| const struct timeval *
|
|
|
|
Signed-off-by: Gabi Falk <gabifalk@gmx.com>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
---
|
|
bridge/vlan.c | 1 +
|
|
bridge/vni.c | 1 +
|
|
vdpa/vdpa.c | 1 +
|
|
3 files changed, 3 insertions(+)
|
|
|
|
--- a/bridge/vlan.c
|
|
+++ b/bridge/vlan.c
|
|
@@ -4,6 +4,7 @@
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <sys/socket.h>
|
|
+#include <sys/time.h>
|
|
#include <net/if.h>
|
|
#include <netinet/in.h>
|
|
#include <linux/if_bridge.h>
|
|
--- a/bridge/vni.c
|
|
+++ b/bridge/vni.c
|
|
@@ -10,6 +10,7 @@
|
|
#include <string.h>
|
|
#include <fcntl.h>
|
|
#include <sys/socket.h>
|
|
+#include <sys/time.h>
|
|
#include <net/if.h>
|
|
#include <netinet/in.h>
|
|
#include <linux/if_link.h>
|
|
--- a/vdpa/vdpa.c
|
|
+++ b/vdpa/vdpa.c
|
|
@@ -3,6 +3,7 @@
|
|
#include <stdio.h>
|
|
#include <getopt.h>
|
|
#include <errno.h>
|
|
+#include <sys/time.h>
|
|
#include <linux/genetlink.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/vdpa.h>
|