DBus 1.4.6 and Git master build error on Windows

[Simon McVittie]

On Mon, 07 Mar 2011 at 14:21:24 +0100, Andre Heinecke wrote:
> If you could get rid of dbus-sysdeps in config-parser that would be a good 
> solution I think.

Unfortunately, this is needed for some of the utility functions, so I don't
think that'll fly.

> No this is definitly not a good solution this is just defining the include 
> guard for _WINIOCTL_ (which in mingw is _WINIOCTL_H_) If you then use a 
> function from windows.h that depends on winioctl.h you have a Problem.

Ugh. OK, I've opened a bug: https://bugs.freedesktop.org/show_bug.cgi?id=35083

> > Like I said on IRC, I'd be happy enough to merge this if you amended it to
> > add a comment [...]
> Sorry missed that on IRC, attached is the amended patch.

I think your solution is the least bad we have, so I've applied the revised
patch (and fixed a couple more occurrences of ELEMENT_TYPE, in
config-parser-trivial.c - you probably missed these because it's only used
on Unix). Thanks!

(I noticed your git seems to be misconfigured, and thinks your email address
is "Andre Heinecke aheinecke at intevation.de" in the formatted patch - I suspect
you've mistakenly set user.email to "Andre Heinecke <aheinecke at intevation.de>"
where it should just be "aheinecke at intevation.de", with your name in user.name
instead. I amended the patch to fix this.)

Regards,
    S