Merge branch 'fd-passing'

[platform/upstream/dbus.git] / dbus / dbus-threads-internal.h

diff --git a/dbus/dbus-threads-internal.h b/dbus/dbus-threads-internal.h
index 700c4f7..11f9ce2 100644 (file)
--- a/dbus/dbus-threads-internal.h
+++ b/dbus/dbus-threads-internal.h
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-threads-internal.h  D-Bus thread primitives
  *
  * Copyright (C) 2002, 2005 Red Hat Inc.
@@ -17,7 +17,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 #ifndef DBUS_THREADS_INTERNAL_H
@@ -31,8 +31,8 @@ DBUS_BEGIN_DECLS
 
 DBusMutex*   _dbus_mutex_new                 (void);
 void         _dbus_mutex_free                (DBusMutex         *mutex);
-dbus_bool_t  _dbus_mutex_lock                (DBusMutex         *mutex);
-dbus_bool_t  _dbus_mutex_unlock              (DBusMutex         *mutex);
+void         _dbus_mutex_lock                (DBusMutex         *mutex);
+void         _dbus_mutex_unlock              (DBusMutex         *mutex);
 void         _dbus_mutex_new_at_location     (DBusMutex        **location_p);
 void         _dbus_mutex_free_at_location    (DBusMutex        **location_p);
 
@@ -43,10 +43,10 @@ void         _dbus_condvar_wait              (DBusCondVar       *cond,
 dbus_bool_t  _dbus_condvar_wait_timeout      (DBusCondVar       *cond,
                                               DBusMutex         *mutex,
                                               int                timeout_milliseconds);
-void          _dbus_condvar_wake_one         (DBusCondVar       *cond);
-void          _dbus_condvar_wake_all         (DBusCondVar       *cond);
-void          _dbus_condvar_new_at_location  (DBusCondVar      **location_p);
-void          _dbus_condvar_free_at_location (DBusCondVar      **location_p);
+void         _dbus_condvar_wake_one          (DBusCondVar       *cond);
+void         _dbus_condvar_wake_all          (DBusCondVar       *cond);
+void         _dbus_condvar_new_at_location   (DBusCondVar      **location_p);
+void         _dbus_condvar_free_at_location  (DBusCondVar      **location_p);
 
 DBUS_END_DECLS