[Cvs-cvs] ccvs/src ChangeLog recurse.c recurse.h

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   08/01/01 23:12:42

Modified files:
        src            : ChangeLog recurse.c recurse.h 

Log message:
        * recurse.h (enum lock_type): Change to cvs_lock_type to avoid
        conflicts on Solaris 8.
        (Reported by Carson Gaspar <address@hidden>.)
        * recurse.c: Ditto.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3552&r2=1.3553
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.h?cvsroot=cvs&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3552
retrieving revision 1.3553
diff -u -b -r1.3552 -r1.3553
--- ChangeLog   20 Dec 2007 16:09:25 -0000      1.3552
+++ ChangeLog   1 Jan 2008 23:12:41 -0000       1.3553
@@ -1,3 +1,10 @@
+2008-01-01  Larry Jones  <address@hidden>
+
+       * recurse.h (enum lock_type): Change to cvs_lock_type to avoid
+       conflicts on Solaris 8.
+       (Reported by Carson Gaspar <address@hidden>.)
+       * recurse.c: Ditto.
+
 2007-12-20  Larry Jones  <address@hidden>
 
        * commit.c, entries.c, find_names.c, history.c, ignore.c, import.c,

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- recurse.c   12 Dec 2007 17:59:09 -0000      1.127
+++ recurse.c   1 Jan 2008 23:12:42 -0000       1.128
@@ -58,7 +58,7 @@
     Dtype flags;
     int which;
     int aflag;
-    enum lock_type locktype;
+    enum cvs_lock_type locktype;
     int dosrcs;
     char *repository;                  /* Keep track of repository for rtag */
 };
@@ -191,7 +191,7 @@
 start_recursion (FILEPROC fileproc, FILESDONEPROC filesdoneproc,
                  DIRENTPROC direntproc, DIRLEAVEPROC dirleaveproc,
                  void *callerdat, int argc, char **argv, int local,
-                 int which, int aflag, enum lock_type locktype,
+                 int which, int aflag, enum cvs_lock_type locktype,
                  const char *update_preload, int dosrcs,
                 char *repository_in)
 {

Index: recurse.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- recurse.h   12 Sep 2007 19:14:27 -0000      1.3
+++ recurse.h   1 Jan 2008 23:12:42 -0000       1.4
@@ -41,7 +41,7 @@
 #endif
 
 /* Recursion processor lock types */
-enum lock_type
+enum cvs_lock_type
 {
     CVS_LOCK_NONE,
     CVS_LOCK_READ,
@@ -62,7 +62,7 @@
 int start_recursion (FILEPROC fileproc, FILESDONEPROC filesdoneproc,
                     DIRENTPROC direntproc, DIRLEAVEPROC dirleaveproc,
                     void *callerdat, int argc, char *argv[], int local,
-                    int which, int aflag, enum lock_type locktype,
+                    int which, int aflag, enum cvs_lock_type locktype,
                     const char *update_preload, int dosrcs, char *repository);
 
 #endif /* RECURSE_H */