CVS update: /ccvs/src/

[email protected] 30 Apr 2005 16:52:16 -0000
Newsgroups gmane.comp.version-control.cvs.cvs
Message-ID <[email protected]>
User: mdb     
Date: 05/04/30 09:52:16

Modified:
 /ccvs/src/
  ChangeLog, lock.c

Log:
 * lock.c (global_readlock, global_writelock, global_history_lock):
 Add missing alternatives for non-LOCK_COMPATIBILITY initialization.

File Changes:

Directory: /ccvs/src/
=====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/ChangeLog?r1=1.3180&r2=1.3181
Delta lines:  +5 -0
-------------------
--- ChangeLog	30 Apr 2005 03:55:07 -0000	1.3180
+++ ChangeLog	30 Apr 2005 16:52:13 -0000	1.3181
@@ -1,3 +1,8 @@
+2005-04-30  Mark D. Baushke  <[email protected]>
+
+	* lock.c (global_readlock, global_writelock, global_history_lock):
+	Add missing alternatives for non-LOCK_COMPATIBILITY initialization.
+
 2005-04-28  Derek Price  <[email protected]>
 
 	* cvs.h (history_lock, clear_history_lock): New protos.

File [changed]: lock.c
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/lock.c?r1=1.113&r2=1.114
Delta lines:  +8 -0
-------------------
--- lock.c	30 Apr 2005 03:55:07 -0000	1.113
+++ lock.c	30 Apr 2005 16:52:13 -0000	1.114
@@ -129,11 +129,19 @@
 
 /* This is the (single) readlock which is set by Reader_Lock.  The
    repository field is NULL if there is no such lock.  */
+#ifdef LOCK_COMPATIBILITY
 static struct lock global_readlock = {NULL, NULL, NULL, CVSLCK, NULL, false};
 static struct lock global_writelock = {NULL, NULL, NULL, CVSLCK, NULL, false};
 
 static struct lock global_history_lock = {NULL, NULL, NULL, CVSHISTLCK,
 					  NULL, false};
+#else
+static struct lock global_readlock = {NULL, NULL, CVSLCK, NULL, false};
+static struct lock global_writelock = {NULL, NULL, CVSLCK, NULL, false};
+
+static struct lock global_history_lock = {NULL, NULL, CVSHISTLCK, NULL,
+					  false};
+#endif /* LOCK_COMPATIBILITY */
 
 /* List of locks set by lock_tree_for_write.  This is redundant
    with locklist, sort of.  */