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