From 427a1a2cb1d35b83b6302886f46289f6d617134d Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Mon, 30 Jul 2012 15:46:55 +0000 Subject: qapi: avoid reserved keywords Clang compiler complained about use of reserved word 'restrict' in SLIRP and QAPI. Prefix C keywords with "q_", adjust SLIRP accordingly. Reviewed-by: Markus Armbruster Signed-off-by: Blue Swirl --- net/slirp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'net') diff --git a/net/slirp.c b/net/slirp.c index 08adb97da5..8db66ea539 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -718,9 +718,9 @@ int net_init_slirp(const NetClientOptions *opts, const char *name, net_init_slirp_configs(user->hostfwd, SLIRP_CFG_HOSTFWD); net_init_slirp_configs(user->guestfwd, 0); - ret = net_slirp_init(peer, "user", name, user->restrict, vnet, user->host, - user->hostname, user->tftp, user->bootfile, - user->dhcpstart, user->dns, user->smb, + ret = net_slirp_init(peer, "user", name, user->q_restrict, vnet, + user->host, user->hostname, user->tftp, + user->bootfile, user->dhcpstart, user->dns, user->smb, user->smbserver); while (slirp_configs) { -- cgit v1.2.3