Merge branch 'warnings' into 'master'
win32: declare some local functions as static
See merge request slirp/libslirp!121
diff --git a/meson.build b/meson.build
index 5605dc9..abbf0c7 100644
--- a/meson.build
+++ b/meson.build
@@ -54,6 +54,9 @@
glib_dep = dependency('glib-2.0')
cc = meson.get_compiler('c')
+add_project_arguments(cc.get_supported_arguments('-Wmissing-prototypes', '-Wstrict-prototypes',
+ '-Wredundant-decls', '-Wundef', '-Wwrite-strings'),
+ language: 'c', native: false)
platform_deps = []
diff --git a/src/slirp.c b/src/slirp.c
index 1423b01..04bce41 100644
--- a/src/slirp.c
+++ b/src/slirp.c
@@ -139,7 +139,7 @@
return 0;
}
-int is_site_local_dns_broadcast(struct in6_addr *address)
+static int is_site_local_dns_broadcast(struct in6_addr *address)
{
int i;
for (i = 0; i < G_N_ELEMENTS(SITE_LOCAL_DNS_BROADCAST_ADDRS); i++) {
@@ -150,7 +150,7 @@
return 0;
}
-void print_dns_v6_address(struct in6_addr address)
+static void print_dns_v6_address(struct in6_addr address)
{
char address_str[INET6_ADDRSTRLEN] = "";
if (inet_ntop(AF_INET6, &address, address_str, INET6_ADDRSTRLEN)
@@ -166,7 +166,7 @@
// are on deprecated addresses and not generally expected
// to work. Further details at:
// https://www.ietf.org/proceedings/52/I-D/draft-ietf-ipngwg-dns-discovery-03.txt
-int get_ipv6_dns_server(struct in6_addr *dns_server_address, uint32_t *scope_id)
+static int get_ipv6_dns_server(struct in6_addr *dns_server_address, uint32_t *scope_id)
{
PIP_ADAPTER_ADDRESSES addresses = NULL;
PIP_ADAPTER_ADDRESSES address = NULL;
diff --git a/test/pingtest.c b/test/pingtest.c
index 46ec60a..8607db6 100644
--- a/test/pingtest.c
+++ b/test/pingtest.c
@@ -24,7 +24,7 @@
#ifdef _WIN32
//#include <sys/select.h>
#include <winsock2.h>
-int slirp_inet_aton(const char *cp, struct in_addr *ia)
+static int slirp_inet_aton(const char *cp, struct in_addr *ia)
{
uint32_t addr = inet_addr(cp);
if (addr == 0xffffffff) {
