--- src/recurse.h.DIST 2007-12-31 10:15:52.811032000 -0500 +++ src/recurse.h 2007-12-31 10:16:30.872372000 -0500 @@ -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 */ --- src/recurse.c.DIST 2007-12-31 10:15:47.042382000 -0500 +++ src/recurse.c 2007-12-31 10:16:15.572423000 -0500 @@ -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) {