From: Simon McVittie <smcv@collabora.com>
Date: Mon, 16 May 2022 18:36:38 +0000 (+0000)
Subject: Merge branch 'fix-wshadow' into 'master'
X-Git-Tag: dbus-1.15.0~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=146f48ba0b462e1aa18680c21ef65ed6f716e844;p=thirdparty%2Fdbus.git

Merge branch 'fix-wshadow' into 'master'

dir-watch-kqueue: Silence -Wshadow warning

See merge request dbus/dbus!307
---

146f48ba0b462e1aa18680c21ef65ed6f716e844