diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
commit | a6ee13798647ec09fb33e316a90ef6ed0b7f314a (patch) | |
tree | 815ded684a1ee9e4c23c2f03c98691b9272243c1 /community/systemd | |
parent | c3b94090a6330f678ade2f767e76ab7802d3463e (diff) | |
parent | 4d22176132f4a830ab0cc510dabbc9f8c1c362ea (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'community/systemd')
-rw-r--r-- | community/systemd/mqueue-signed-int.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/community/systemd/mqueue-signed-int.patch b/community/systemd/mqueue-signed-int.patch deleted file mode 100644 index dc9ac3524..000000000 --- a/community/systemd/mqueue-signed-int.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/dbus-common.c b/src/dbus-common.c -index fe7f84b..9bf0dab 100644 ---- a/src/dbus-common.c -+++ b/src/dbus-common.c -@@ -569,15 +569,15 @@ int bus_property_append_ul(DBusMessageIter *i, const char *property, void *data) - } - - int bus_property_append_long(DBusMessageIter *i, const char *property, void *data) { -- uint64_t u; -+ int64_t l; - - assert(i); - assert(property); - assert(data); - -- u = (int64_t) *(long*) data; -+ l = (int64_t) *(long*) data; - -- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &u)) -+ if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &l)) - return -ENOMEM; - - return 0; -diff --git a/src/dbus-socket.c b/src/dbus-socket.c -index b81569d..7194611 100644 ---- a/src/dbus-socket.c -+++ b/src/dbus-socket.c -@@ -115,8 +115,8 @@ DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMes - { "org.freedesktop.systemd1.Socket", "MaxConnections", bus_property_append_unsigned, "u", &u->socket.max_connections }, - { "org.freedesktop.systemd1.Socket", "NConnections", bus_property_append_unsigned, "u", &u->socket.n_connections }, - { "org.freedesktop.systemd1.Socket", "NAccepted", bus_property_append_unsigned, "u", &u->socket.n_accepted }, -- { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"t", &u->socket.mq_maxmsg }, -- { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"t", &u->socket.mq_msgsize }, -+ { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"x", &u->socket.mq_maxmsg }, -+ { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"x", &u->socket.mq_msgsize }, - { NULL, NULL, NULL, NULL, NULL } - }; - |