12c12
< * $FreeBSD: head/contrib/cvs/src/cvs.h 102843 2002-09-02 05:57:14Z peter $
---
> * $FreeBSD: head/contrib/cvs/src/cvs.h 107487 2002-12-02 03:17:49Z peter $
16c16,18
< #include "config.h" /* this is stuff found via autoconf */
---
> #ifdef HAVE_CONFIG_H
> # include <config.h> /* this is stuff found via autoconf */
> #endif /* CONFIG_H */
68c70,74
< #include <fnmatch.h> /* This is supposed to be available on Posix systems */
---
> #ifdef HAVE_FNMATCH
> # include <fnmatch.h> /* This is supposed to be available on Posix systems */
> #else /* HAVE_FNMATCH */
> # include "fnmatch.h" /* Our substitute */
> #endif /* HAVE_FNMATCH */
364a371,375
> /* Recursion processor lock types */
> #define LOCK_NONE 0
> #define LOCK_READ 1
> #define LOCK_WRITE 2
>
431,434d441
< extern int diff_execv PROTO ((char *file1, char *file2,
< char *label1, char *label2,
< char *options, char *out));
<
496a504
> char *strcat_filename_onto_homedir PROTO ((const char *, const char *));
649c657
< int aflag, int readlock, char *update_preload,
---
> int aflag, int locktype, char *update_preload,
862a871,879
> /* Some systems (namely Mac OS X) have conflicting definitions for these
> * functions. Avoid them.
> */
> #ifdef HAVE_LOGIN
> # define login cvs_login
> #endif /* HAVE_LOGIN */
> #ifdef HAVE_LOGOUT
> # define logout cvs_logout
> #endif /* HAVE_LOGOUT */
864c881
< int logout PROTO((int argc, char **argv));
---
> extern int logout PROTO((int argc, char **argv));