From: Pierre Ossman Date: Mon, 9 Nov 2015 14:28:50 +0000 (+0100) Subject: Remove old Windows CE code X-Git-Tag: v1.6.90~95^2~30 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7835815c1c32cdccfa74fb10ad25de4956bdc939;p=tigervnc.git Remove old Windows CE code --- diff --git a/common/rdr/FdOutStream.cxx b/common/rdr/FdOutStream.cxx index 75131a64..f4299030 100644 --- a/common/rdr/FdOutStream.cxx +++ b/common/rdr/FdOutStream.cxx @@ -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); diff --git a/common/rfb/Logger_file.cxx b/common/rfb/Logger_file.cxx index 8a109e4a..ebe15d52 100644 --- a/common/rfb/Logger_file.cxx +++ b/common/rfb/Logger_file.cxx @@ -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;