From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 24 Mar 2022 13:40:44 +0000 (+0000)
Subject: Merge branch 'fix-freebsd-environ' into 'master'
X-Git-Tag: dbus-1.15.0~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1312fd5f81be41f632fdbd391d4d4be709f28f24;p=thirdparty%2Fdbus.git

Merge branch 'fix-freebsd-environ' into 'master'

Revert "Fix gcc compile error: redundant redeclaration of ‘environ’ [-Werror=redundant-decls]"

See merge request dbus/dbus!277
---

1312fd5f81be41f632fdbd391d4d4be709f28f24