dbus/dbus dbus-internals.h, 1.56, 1.57 dbus-sysdeps.c, 1.107, 1.108 dbus-threads.c, 1.25, 1.26

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv1752/dbus

Modified Files:
	dbus-internals.h dbus-sysdeps.c dbus-threads.c 
Log Message:
Patch provided by Ralf Habacker (ralf dot habacker at freenet dot de) 

* dbus/dbus-sysdeps.c, dbus/dbus-threads.c, dbus/dbus-internals.h:
  Add two more global locks for use on windows platforms.  These are
  unused on non-windows platforms but are not ifdefed out to avoid
  potential bugs (i.e. the few bytes lost does not warrent the extra
  maintanence and complexity that having seperate sets of locks would
  cause)


Index: dbus-internals.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-internals.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- dbus-internals.h	3 Aug 2006 20:34:36 -0000	1.56
+++ dbus-internals.h	18 Aug 2006 15:46:59 -0000	1.57
@@ -281,7 +281,9 @@
 _DBUS_DECLARE_GLOBAL_LOCK (system_users);
 _DBUS_DECLARE_GLOBAL_LOCK (message_cache);
 _DBUS_DECLARE_GLOBAL_LOCK (shared_connections);
-#define _DBUS_N_GLOBAL_LOCKS (11)
+_DBUS_DECLARE_GLOBAL_LOCK (win_fds);
+_DBUS_DECLARE_GLOBAL_LOCK (sid_atom_cache);
+#define _DBUS_N_GLOBAL_LOCKS (13)
 
 dbus_bool_t _dbus_threads_init_debug (void);
 

Index: dbus-sysdeps.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- dbus-sysdeps.c	14 Aug 2006 19:11:35 -0000	1.107
+++ dbus-sysdeps.c	18 Aug 2006 15:46:59 -0000	1.108
@@ -69,6 +69,9 @@
 #define socklen_t int
 #endif
 
+_DBUS_DEFINE_GLOBAL_LOCK (win_fds);
+_DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
+
 /**
  * @addtogroup DBusInternalsUtils
  * @{

Index: dbus-threads.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-threads.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dbus-threads.c	16 Aug 2006 22:30:15 -0000	1.25
+++ dbus-threads.c	18 Aug 2006 15:46:59 -0000	1.26
@@ -405,6 +405,8 @@
   
   DBusMutex **global_locks[] = {
 #define LOCK_ADDR(name) (& _dbus_lock_##name)
+    LOCK_ADDR (win_fds),
+    LOCK_ADDR (sid_atom_cache),
     LOCK_ADDR (list),
     LOCK_ADDR (connection_slots),
     LOCK_ADDR (pending_call_slots),