[Cvs-cvs] Changes to ccvs/src/subr.c [cvs1-11-x-branch]

[Larry Jones]

Index: ccvs/src/subr.c
diff -u ccvs/src/subr.c:1.72.4.30 ccvs/src/subr.c:1.72.4.31
--- ccvs/src/subr.c:1.72.4.30   Mon Jan 31 22:15:12 2005
+++ ccvs/src/subr.c     Fri Sep  2 19:37:35 2005
@@ -324,7 +324,6 @@
     const char *rev;
 {
     char *newrev, *p;
-    int lastfield;
     size_t len = strlen (rev);
 
     newrev = xmalloc (len + 2);
@@ -687,11 +686,9 @@
      * conflict any more.
      */
 
-#ifdef SERVER_SUPPORT
     if (server_active)
        retcode = ts_conflict[0] == '=';
     else 
-#endif /* SERVER_SUPPORT */
     {
        filestamp = time_stamp (finfo->file);
        retcode = !strcmp (ts_conflict, filestamp);