Index: cvs-1.8.1/configure
diff -c cvs-1.8.1/configure:1.1.1.1 cvs-1.8.1/configure:1.2
*** cvs-1.8.1/configure:1.1.1.1	Thu Aug  8 20:09:20 1996
--- cvs-1.8.1/configure	Thu Aug  8 23:25:30 1996
***************
*** 2902,2921 ****
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
! (set) 2>&1 |
!   sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
!   >> confcache
! if cmp -s $cache_file confcache; then
!   :
! else
!   if test -w $cache_file; then
!     echo "updating cache $cache_file"
!     cat confcache > $cache_file
!   else
!     echo "not updating unwritable cache $cache_file"
!   fi
! fi
! rm -f confcache
  
  trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
  
--- 2902,2921 ----
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
! #(set) 2>&1 |
! #  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
! #  >> confcache
! #if cmp -s $cache_file confcache; then
! #  :
! #else
! #  if test -w $cache_file; then
! #    echo "updating cache $cache_file"
! #    cat confcache > $cache_file
! #  else
! #    echo "not updating unwritable cache $cache_file"
! #  fi
! #fi
! #rm -f confcache
  
  trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
  
Index: cvs-1.8.1/lib/getline.h
diff -c cvs-1.8.1/lib/getline.h:1.1.1.1 cvs-1.8.1/lib/getline.h:1.2
*** cvs-1.8.1/lib/getline.h:1.1.1.1	Thu Aug  8 20:10:32 1996
--- cvs-1.8.1/lib/getline.h	Thu Aug  8 23:28:12 1996
***************
*** 4,15 ****
  #include <stdio.h>
  
  #if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
! #define __PROTO(args) args
  #else
! #define __PROTO(args) ()
  #endif  /* GCC.  */
  
  int
!   getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
  
  #endif /* _getline_h_ */
--- 4,15 ----
  #include <stdio.h>
  
  #if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
! #define ___PROTO(args) args
  #else
! #define ___PROTO(args) ()
  #endif  /* GCC.  */
  
  int
!   getline ___PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
  
  #endif /* _getline_h_ */
Index: cvs-1.8.1/lib/savecwd.h
diff -c cvs-1.8.1/lib/savecwd.h:1.1.1.1 cvs-1.8.1/lib/savecwd.h:1.2
*** cvs-1.8.1/lib/savecwd.h:1.1.1.1	Thu Aug  8 20:11:02 1996
--- cvs-1.8.1/lib/savecwd.h	Thu Aug  8 23:28:18 1996
***************
*** 8,20 ****
    };
  
  #if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
! #define __PROTO(args) args
  #else
! #define __PROTO(args) ()
  #endif  /* GCC.  */
  
! int save_cwd __PROTO((struct saved_cwd *cwd));
! int restore_cwd __PROTO((const struct saved_cwd *cwd, const char *dest));
! void free_cwd __PROTO((struct saved_cwd *cwd));
  
  #endif /* SAVE_CWD_H */
--- 8,20 ----
    };
  
  #if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
! #define ___PROTO(args) args
  #else
! #define ___PROTO(args) ()
  #endif  /* GCC.  */
  
! int save_cwd ___PROTO((struct saved_cwd *cwd));
! int restore_cwd ___PROTO((const struct saved_cwd *cwd, const char *dest));
! void free_cwd ___PROTO((struct saved_cwd *cwd));
  
  #endif /* SAVE_CWD_H */
Index: cvs-1.8.1/src/server.c
diff -c cvs-1.8.1/src/server.c:1.1.1.1 cvs-1.8.1/src/server.c:1.2
*** cvs-1.8.1/src/server.c:1.1.1.1	Thu Aug  8 20:14:40 1996
--- cvs-1.8.1/src/server.c	Thu Aug  8 23:30:08 1996
***************
*** 1545,1551 ****
  #ifdef EWOULDBLOCK
  			|| errno == EWOULDBLOCK
  #endif
! 			|| errno == EAGAIN))
  		{
  		    /*
  		     * A nonblocking write failed to write any data.
--- 1545,1554 ----
  #ifdef EWOULDBLOCK
  			|| errno == EWOULDBLOCK
  #endif
! #ifdef EAGAIN
! 			|| errno == EAGAIN
! #endif
! ))
  		{
  		    /*
  		     * A nonblocking write failed to write any data.
***************
*** 1909,1915 ****
  		return -1;
  	    }
  
! 	    if (errno == EAGAIN
  #ifdef EWOULDBLOCK
  		|| errno == EWOULDBLOCK
  #endif
--- 1912,1921 ----
  		return -1;
  	    }
  
! 	    if (0
! #ifdef EAGAIN
! 		|| errno == EAGAIN
! #endif
  #ifdef EWOULDBLOCK
  		|| errno == EWOULDBLOCK
  #endif
