From 12b759f00b98ed47366e3656744f0f0090ee40e2 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 8 Mar 2013 13:00:38 +0100
Subject: [PATCH 1/2] Refactored to use dbus_pid_t instead of unsigned long.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61787
---
 dbus/dbus-connection.c |    2 +-
 dbus/dbus-connection.h |    3 ++-
 dbus/dbus-transport.c  |    2 +-
 dbus/dbus-transport.h  |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index ee33b6c..862b1f0 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -5178,7 +5178,7 @@ dbus_connection_get_unix_user (DBusConnection *connection,
  */
 dbus_bool_t
 dbus_connection_get_unix_process_id (DBusConnection *connection,
-				     unsigned long  *pid)
+                                     dbus_pid_t     *pid)
 {
   dbus_bool_t result;
 
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h
index fe4d04e..24decbf 100644
--- a/dbus/dbus-connection.h
+++ b/dbus/dbus-connection.h
@@ -27,6 +27,7 @@
 #ifndef DBUS_CONNECTION_H
 #define DBUS_CONNECTION_H
 
+#include <dbus/dbus-sysdeps.h>
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-message.h>
@@ -263,7 +264,7 @@ dbus_bool_t        dbus_connection_get_unix_user                (DBusConnection
                                                                  unsigned long              *uid);
 DBUS_EXPORT
 dbus_bool_t        dbus_connection_get_unix_process_id          (DBusConnection             *connection,
-                                                                 unsigned long              *pid);
+                                                                 dbus_pid_t                 *pid);
 DBUS_EXPORT
 dbus_bool_t        dbus_connection_get_adt_audit_session_data   (DBusConnection             *connection,
                                                                  void                      **data,
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index 6b58fda..ed8690d 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -1320,7 +1320,7 @@ _dbus_transport_get_unix_user (DBusTransport *transport,
  */
 dbus_bool_t
 _dbus_transport_get_unix_process_id (DBusTransport *transport,
-				     unsigned long *pid)
+                                     dbus_pid_t *pid)
 {
   DBusCredentials *auth_identity;
 
diff --git a/dbus/dbus-transport.h b/dbus/dbus-transport.h
index 4b82151..7d44577 100644
--- a/dbus/dbus-transport.h
+++ b/dbus/dbus-transport.h
@@ -74,7 +74,7 @@ dbus_bool_t        _dbus_transport_get_socket_fd          (DBusTransport
 dbus_bool_t        _dbus_transport_get_unix_user          (DBusTransport              *transport,
                                                            unsigned long              *uid);
 dbus_bool_t        _dbus_transport_get_unix_process_id     (DBusTransport              *transport,
-                                                           unsigned long              *pid);
+                                                            dbus_pid_t                 *pid);
 dbus_bool_t        _dbus_transport_get_adt_audit_session_data (DBusTransport              *transport,
                                                                void                      **data,
                                                                int                        *data_size);
-- 
1.7.4.msysgit.0