FreeBSD patch

Benedikt Meurer benny@xfce.org
Fri, 13 Feb 2004 20:58:34 +0100


This is a multi-part message in MIME format.
--------------030501060903030105030808
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hello,

Small patch to get dbus working on FreeBSD/NetBSD.

regards,
Benedikt

-- 
XFce  --  small, stable, fast  --  http://www.xfce.org/

--------------030501060903030105030808
Content-Type: text/plain;
 name="dbus-freebsd-patch-20040213.diff"
Content-Transfer-Encoding: base64
Content-Disposition: inline;
 filename="dbus-freebsd-patch-20040213.diff"

SW5kZXg6IGRidXMvZGJ1cy1zeXNkZXBzLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2
cy9kYnVzL2RidXMvZGJ1cy9kYnVzLXN5c2RlcHMuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24g
MS42OApkaWZmIC11IC1yMS42OCBkYnVzLXN5c2RlcHMuYwotLS0gZGJ1cy9kYnVzLXN5c2Rl
cHMuYwkyIERlYyAyMDAzIDEwOjQ0OjIxIC0wMDAwCTEuNjgKKysrIGRidXMvZGJ1cy1zeXNk
ZXBzLmMJMTMgRmViIDIwMDQgMTk6NTY6MDkgLTAwMDAKQEAgLTQxNyw3ICs0MTcsNyBAQAog
CiAgIGlmIChhYnN0cmFjdCkKICAgICB7Ci0jaWZkZWYgSEFWRV9BQlNUUkFDVF9TT0NLRVRT
CisjaWYgZGVmaW5lZChIQVZFX0FCU1RSQUNUX1NPQ0tFVFMpICYmIEhBVkVfQUJTVFJBQ1Rf
U09DS0VUUwogICAgICAgLyogcmVtZW1iZXIgdGhhdCBhYnN0cmFjdCBuYW1lcyBhcmVuJ3Qg
bnVsLXRlcm1pbmF0ZWQgc28gd2UgcmVseQogICAgICAgICogb24gc3VuX3BhdGggYmVpbmcg
ZmlsbGVkIGluIHdpdGggemVyb2VzIGFib3ZlLgogICAgICAgICovCkBAIC01MDUsNyArNTA1
LDcgQEAKICAgCiAgIGlmIChhYnN0cmFjdCkKICAgICB7Ci0jaWZkZWYgSEFWRV9BQlNUUkFD
VF9TT0NLRVRTCisjaWYgZGVmaW5lZChIQVZFX0FCU1RSQUNUX1NPQ0tFVFMpICYmIEhBVkVf
QUJTVFJBQ1RfU09DS0VUUwogICAgICAgLyogcmVtZW1iZXIgdGhhdCBhYnN0cmFjdCBuYW1l
cyBhcmVuJ3QgbnVsLXRlcm1pbmF0ZWQgc28gd2UgcmVseQogICAgICAgICogb24gc3VuX3Bh
dGggYmVpbmcgZmlsbGVkIGluIHdpdGggemVyb2VzIGFib3ZlLgogICAgICAgICovCkBAIC03
OTgsNyArNzk4LDcgQEAKICAgc3RydWN0IGlvdmVjIGlvdjsKICAgY2hhciBidWY7CiAKLSNp
ZmRlZiBIQVZFX0NNU0dDUkVEIAorI2lmIGRlZmluZWQoTE9DQUxfQ1JFRFMpICYmIGRlZmlu
ZWQoSEFWRV9DTVNHQ1JFRCkKICAgY2hhciBjbXNnbWVtW0NNU0dfU1BBQ0UgKHNpemVvZiAo
c3RydWN0IGNtc2djcmVkKSldOwogICBzdHJ1Y3QgY21zZ2hkciAqY21zZyA9IChzdHJ1Y3Qg
Y21zZ2hkciAqKSBjbXNnbWVtOwogI2VuZGlmCkBAIC04MzQsNyArODM0LDcgQEAKICAgbXNn
Lm1zZ19pb3YgPSAmaW92OwogICBtc2cubXNnX2lvdmxlbiA9IDE7CiAKLSNpZmRlZiBIQVZF
X0NNU0dDUkVECisjaWYgZGVmaW5lZChMT0NBTF9DUkVEUykgJiYgZGVmaW5lZChIQVZFX0NN
U0dDUkVEKQogICBtZW1zZXQgKGNtc2dtZW0sIDAsIHNpemVvZiAoY21zZ21lbSkpOwogICBt
c2cubXNnX2NvbnRyb2wgPSBjbXNnbWVtOwogICBtc2cubXNnX2NvbnRyb2xsZW4gPSBzaXpl
b2YgKGNtc2dtZW0pOwpAQCAtODU5LDEwICs4NTksMTAgQEAKICAgICAgIHJldHVybiBGQUxT
RTsKICAgICB9CiAKLSNpZmRlZiBIQVZFX0NNU0dDUkVECisjaWYgZGVmaW5lZChMT0NBTF9D
UkVEUykgJiYgZGVmaW5lZChIQVZFX0NNU0dDUkVEKQogICBpZiAoY21zZy0+Y21zZ19sZW4g
PCBzaXplb2YgKGNtc2dtZW0pIHx8IGNtc2ctPmNtc2dfdHlwZSAhPSBTQ01fQ1JFRFMpCiAg
ICAgewotICAgICAgZGJ1c19zZXRfZXJyb3IgKGVycm9yLCBEQlVTX0VSUk9SX0ZBSUxFRCk7
CisgICAgICBkYnVzX3NldF9lcnJvciAoZXJyb3IsIERCVVNfRVJST1JfRkFJTEVELCAiTWVz
c2FnZSBmcm9tIHJlY3Ztc2coKSB3YXMgbm90IFNDTV9DUkVEUyIpOwogICAgICAgX2RidXNf
dmVyYm9zZSAoIk1lc3NhZ2UgZnJvbSByZWN2bXNnKCkgd2FzIG5vdCBTQ01fQ1JFRFNcbiIp
OwogICAgICAgcmV0dXJuIEZBTFNFOwogICAgIH0KQEAgLTg4Nyw3ICs4ODcsNyBAQAogCV9k
YnVzX3ZlcmJvc2UgKCJGYWlsZWQgdG8gZ2V0c29ja29wdCgpIGNyZWRlbnRpYWxzLCByZXR1
cm5lZCBsZW4gJWQvJWQ6ICVzXG4iLAogCQkgICAgICAgY3JfbGVuLCAoaW50KSBzaXplb2Yg
KGNyKSwgX2RidXNfc3RyZXJyb3IgKGVycm5vKSk7CiAgICAgICB9Ci0jZWxpZiBkZWZpbmVk
KEhBVkVfQ01TR0NSRUQpCisjZWxpZiBkZWZpbmVkKExPQ0FMX0NSRURTKSAmJiBkZWZpbmVk
KEhBVkVfQ01TR0NSRUQpCiAgICAgc3RydWN0IGNtc2djcmVkICpjcmVkOwogCiAgICAgY3Jl
ZCA9IChzdHJ1Y3QgY21zZ2NyZWQgKikgQ01TR19EQVRBIChjbXNnKTsKSW5kZXg6IGRidXMv
ZGJ1cy1zZXJ2ZXIuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL2RidXMvZGJ1cy9k
YnVzL2RidXMtc2VydmVyLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMzIKZGlmZiAtdSAt
cjEuMzIgZGJ1cy1zZXJ2ZXIuYwotLS0gZGJ1cy9kYnVzLXNlcnZlci5jCTIgRGVjIDIwMDMg
MTA6NDQ6MjEgLTAwMDAJMS4zMgorKysgZGJ1cy9kYnVzLXNlcnZlci5jCTEzIEZlYiAyMDA0
IDE5OjU2OjEwIC0wMDAwCkBAIC0zNTQsNyArMzU0LDcgQEAKICAgICAgICAgICAgICAgCiAg
ICAgICAgICAgICAgIHNlcnZlciA9CiAgICAgICAgICAgICAgICAgX2RidXNfc2VydmVyX25l
d19mb3JfZG9tYWluX3NvY2tldCAoX2RidXNfc3RyaW5nX2dldF9jb25zdF9kYXRhICgmZnVs
bF9wYXRoKSwKLSNpZmRlZiBIQVZFX0FCU1RSQUNUX1NPQ0tFVFMKKyNpZiBkZWZpbmVkKEhB
VkVfQUJTVFJBQ1RfU09DS0VUUykgJiYgSEFWRV9BQlNUUkFDVF9TT0NLRVRTCiAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVFJVRSwKICNl
bHNlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgRkFMU0UsCg==
--------------030501060903030105030808--