1On 2009-10-21 I (Tor Lillqvist <tml@iki.fi>) cherry-picked a bunch of 2commits from the dbus4win-noncetcp branch of the dbus4win repository 3to (my clone of) dbus upstream's master branch. 4 5The dbus4win repository is at least currently at 6git://repo.or.cz/dbus4win.git 7 8I went through the commits done to the dbus4win-noncetcp branch since 9the dbus-1.2.14 tag, i.e. commit f719d454329a1a54ff2d569feaf10ceee7cead50. 10 11The following commits were left out because they either 0) were 12already upstream, 1) seemed broken, or 2) seemed pointless to me, 13especially if the commit message didn't say much. For each commit left 14out, below is three lines: its id, the first log comment line, and an 15explanation why I left it out. 16 17f719d454329a1a54ff2d569feaf10ceee7cead50 18configure.in: not all gccs support -Wno-pointer-sign 19already upstream 20 216eddb6e1229b617ad44c8d61107983229dc7d589 22configure.in: fail abstract socket test gracefully when cross-compilin 23already upstream 24 25c54dd9eefa5ed0d54be3b09cf30c12f05130fda1 26r783: one ifdef lesser 27probably pointless 28 2993c288ca3e86e7760d3ac3fa6490257c1b6dc544 30r783: compile if ENOMEM or EINTR is undefined. 31huh, ENOMEM and EINTR is defined in the Microsoft C library 32 334f4ba13357da15c35a9d4ad111bf972a5d0d5db0 34r783: introduced _dbus_daemon_release() function called in _dbus_loop_quit()... 35this can't be right, there can be nested dbus loops afaik 36 37124eb334324472a10de2c7e0a1455d353431f08f 38unix build fixes against windbus-svn 39can't be right to make a char* const when the code below then assigns through it 40 41594bd19a0c45822d8763871e3491d99beb4d22cb 42introduce DBUS_DIR_SEPERATOR and make use of it. On windows, disable some system service tests 43"forward" slashes work fine on Windows, no need to uglify code with DBUS_DIR_SEPARATOR 44 45cd2cdb3457f72cf058d5b19796ee691ceca6b52c 46r783: introduced DBUS_CLEANUP_OLD_SERVICES that does cleanup prev zombie-instances... 47unsure about this. something specific to KDE-on-Windows? 48 49eeedba5b2f5b008819619764943caddd52441adf 50build fixes for OS X, xcode 3.1.2, gcc 4.2.1 51doesn't apply, seems to be upstream? 52 537dc7f71cf3003e006f6e177b5460d14a7cdbf2de 54configure.in: fix pthread detection 55doesn't apply 56 5705b37fa87b1f6aa670de9007879f53a8198a7a89 58configure.in: suppress -fPIC, -fPIE for W32 59doesn't apply 60 61b0d14fed92d9f539cd3478e72dc2f3ea75f3941a 62configure.in: only check for wspiapi.h on Windows 63nah, no harm checking for it on UNIX too 64 651724fc10e516e2d570537d522d8608abba90be5e 66prototypes cleanup 67related to cd2cdb3457f72cf058d5b19796ee691ceca6b52c which was skipped above 68