]> source.dussan.org Git - tigervnc.git/commitdiff
Remove old Windows CE code
authorPierre Ossman <ossman@cendio.se>
Mon, 9 Nov 2015 14:28:50 +0000 (15:28 +0100)
committerPierre Ossman <ossman@cendio.se>
Mon, 9 Nov 2015 14:28:50 +0000 (15:28 +0100)
common/rdr/FdOutStream.cxx
common/rfb/Logger_file.cxx

index 75131a6476661aba8edb4c4e7696bb1f0ae72fa2..f42990305dfa9910bd9b8d13196a4ec9e254c995 100644 (file)
@@ -198,16 +198,7 @@ int FdOutStream::writeWithTimeout(const void* data, int length, int timeoutms)
 
       FD_ZERO(&fds);
       FD_SET(fd, &fds);
-#ifdef _WIN32_WCE
-      // NB: This fixes a broken Winsock2 select() behaviour.  select()
-      // never returns for non-blocking sockets, unless they're already
-      // ready to be written to...
-      u_long zero = 0; ioctlsocket(fd, FIONBIO, &zero);
-#endif
       n = select(fd+1, 0, &fds, 0, tvp);
-#ifdef _WIN32_WCE
-      u_long one = 0; ioctlsocket(fd, FIONBIO, &one);
-#endif
     } while (n < 0 && errno == EINTR);
 
     if (n < 0) throw SystemException("select",errno);
index 8a109e4a09be02cf2840cc4aca25e9a0fff47e7f..ebe15d529df303bc787714cda0c353fe08b49ceb 100644 (file)
@@ -61,13 +61,11 @@ void Logger_File::write(int level, const char *logname, const char *message)
     if (!m_file) return;
   }
 
-#ifndef _WIN32_WCE
   time_t current = time(0);
   if (current != m_lastLogTime) {
     m_lastLogTime = current;
     fprintf(m_file, "\n%s", ctime(&m_lastLogTime));
   }
-#endif
 
   fprintf(m_file," %s:", logname);
   int column = strlen(logname) + 2;