# 
# patch "cvs_client.cc"
#  from [a8c39fbeb0d41a5fede482de334224cd8821ba4a]
#    to [30857975cafb93e361ed1dc9c38ef53da4967cc9]
# 
# patch "cvs_repository.cc"
#  from [b0a844ddd14a9f83cd6fa11a53001894e0524c28]
#    to [e977a38d52821a460694c1d488e92e9e14f3c284]
# 
========================================================================
--- cvs_client.cc	a8c39fbeb0d41a5fede482de334224cd8821ba4a
+++ cvs_client.cc	30857975cafb93e361ed1dc9c38ef53da4967cc9
@@ -9,14 +9,15 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
+//#include <sys/socket.h>
+//#include <netdb.h>
+//#include <netinet/in.h>
 #include "sanity.hh"
 #include "cvs_client.hh"
 #include <boost/lexical_cast.hpp>
 #include <netxx/stream.h>
 
+#if 0
 // copied from netsync.cc from the ssh branch
 static pid_t pipe_and_fork(int *fd1,int *fd2)
 { pid_t result=-1;
@@ -51,6 +52,7 @@
 #endif  
   return result;
 }
+#endif
 
 void cvs_client::writestr(const std::string &s, bool flush)
 { if (s.size()) L(F("writestr(%s") % s); // s mostly contains the \n char
@@ -300,7 +302,7 @@
       if (gethostname(domainname,sizeof domainname))
         throw oops("gethostname "+std::string(strerror(errno)));
       domainname[sizeof(domainname)-1]=0;
-#ifndef __sun
+#if !defined(__sun) && !defined(WIN32)
       unsigned len=strlen(domainname);
       if (len && len<sizeof(domainname)-2)
       { domainname[len]='.';
@@ -550,13 +552,19 @@
   result=timegm(&tm);
 #else // ugly
   const char *tz=getenv("TZ");
+#ifdef WIN32
+  putenv("TZ=UTC");
+#else
   setenv("TZ","",true);
+#endif
   tzset();
   result=mktime(const_cast<struct tm*>(&tm));
+#ifndef WIN32
   if (tz) setenv("TZ", tz, true);
   else unsetenv("TZ");
   tzset();
 #endif
+#endif
 //  L(F("result %ld\n") % result);
   return result;
 }
========================================================================
--- cvs_repository.cc	b0a844ddd14a9f83cd6fa11a53001894e0524c28
+++ cvs_repository.cc	e977a38d52821a460694c1d488e92e9e14f3c284
@@ -14,6 +14,10 @@
 #include <fstream>
 #include <sys/stat.h>
 
+#ifdef WIN32
+#define sleep(x) _sleep(x)
+#endif
+
 #define BACKWARD_COMPATIBLE
 
 using namespace std;