diff options
Diffstat (limited to 'sysutils/dbus/patches/patch-ab')
| -rw-r--r-- | sysutils/dbus/patches/patch-ab | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/sysutils/dbus/patches/patch-ab b/sysutils/dbus/patches/patch-ab index 2f9a302093b..507b923bde2 100644 --- a/sysutils/dbus/patches/patch-ab +++ b/sysutils/dbus/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ +$NetBSD: patch-ab,v 1.13 2008/08/15 12:15:17 wiz Exp $ ---- dbus/dbus-sysdeps-unix.c.orig 2008-04-04 11:24:08.000000000 -0400 +--- dbus/dbus-sysdeps-unix.c.orig 2008-08-06 17:00:29.000000000 +0000 +++ dbus/dbus-sysdeps-unix.c @@ -35,6 +35,9 @@ #include "dbus-list.h" @@ -12,29 +12,18 @@ $NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ #include <sys/types.h> #include <stdlib.h> #include <string.h> -@@ -786,7 +789,9 @@ _dbus_connect_tcp_socket (const char - fprintf(stderr, "Family %s\n", family ? family : "none"); - hints.ai_protocol = IPPROTO_TCP; - hints.ai_socktype = SOCK_STREAM; -+#ifdef AI_ADDRCONFIG - hints.ai_flags = AI_ADDRCONFIG; -+#endif - - if ((res = getaddrinfo(host, port, &hints, &ai)) != 0) - { -@@ -889,7 +894,11 @@ _dbus_listen_tcp_socket (const char +@@ -79,8 +82,8 @@ + #define O_BINARY 0 + #endif - hints.ai_protocol = IPPROTO_TCP; - hints.ai_socktype = SOCK_STREAM; -+#ifdef AI_ADDRCONFIG - hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE; -+#else -+ hints.ai_flags = AI_PASSIVE; -+#endif +-#ifndef _AI_ADDRCONFIG +-#define _AI_ADDRCONFIG 0 ++#ifndef AI_ADDRCONFIG ++#define AI_ADDRCONFIG 0 + #endif - redo_lookup_with_port: - if ((res = getaddrinfo(host, port, &hints, &ai)) != 0 || !ai) -@@ -1753,7 +1762,26 @@ _dbus_parse_uid (const DBusString * + #ifndef HAVE_SOCKLEN_T +@@ -1822,7 +1825,26 @@ _dbus_parse_uid (const DBusString * return TRUE; } @@ -47,12 +36,12 @@ $NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ + atomic_inc_uint((unsigned *)&atomic->value); + return old; +} - ++ +dbus_int32_t +_dbus_atomic_dec (DBusAtomic *atomic) +{ + register dbus_int32_t old = atomic->value; -+ + + atomic_dec_uint((unsigned *)&atomic->value); + return old; +} @@ -61,7 +50,7 @@ $NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ _DBUS_DEFINE_GLOBAL_LOCK (atomic); #if DBUS_USE_ATOMIC_INT_486_COND -@@ -1818,6 +1846,7 @@ _dbus_atomic_dec (DBusAtomic *atomic) +@@ -1887,6 +1909,7 @@ _dbus_atomic_dec (DBusAtomic *atomic) return res; #endif } @@ -69,7 +58,7 @@ $NetBSD: patch-ab,v 1.12 2008/06/19 01:56:44 bjs Exp $ #ifdef DBUS_BUILD_TESTS /** Gets our GID -@@ -2711,8 +2740,18 @@ int +@@ -2780,8 +2803,18 @@ int _dbus_printf_string_upper_bound (const char *format, va_list args) { |