aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-06-20 09:49:36 -0400
committerNick Mathewson <nickm@torproject.org>2014-06-20 09:49:36 -0400
commit5b4ee475aa00bb30675e819a0096209e5e427668 (patch)
tree633b04a111458921fbd5908faed7f47641b9c362 /src/common
parent456184c2a005d282df4bb1c92e0f3d80b52e99cb (diff)
downloadtor-5b4ee475aa00bb30675e819a0096209e5e427668.tar
tor-5b4ee475aa00bb30675e819a0096209e5e427668.tar.gz
Remove code for Windows CE support
As far as I know, nobody has used this in ages. It would be a pretty big surprise if it had worked. Closes ticket 11446.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/compat.c9
-rw-r--r--src/common/compat.h15
-rw-r--r--src/common/tortls.c4
-rw-r--r--src/common/util.c2
4 files changed, 1 insertions, 29 deletions
diff --git a/src/common/compat.c b/src/common/compat.c
index e25ecc462..6fb9c210e 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -2485,14 +2485,12 @@ get_uname(void)
"Unrecognized version of Windows [major=%d,minor=%d]",
(int)info.dwMajorVersion,(int)info.dwMinorVersion);
}
-#if !defined (WINCE)
#ifdef VER_NT_SERVER
if (info.wProductType == VER_NT_SERVER ||
info.wProductType == VER_NT_DOMAIN_CONTROLLER) {
strlcat(uname_result, " [server]", sizeof(uname_result));
}
#endif
-#endif
#else
strlcpy(uname_result, "Unknown platform", sizeof(uname_result));
#endif
@@ -2697,15 +2695,8 @@ tor_gettimeofday(struct timeval *timeval)
uint64_t ft_64;
FILETIME ft_ft;
} ft;
-#if defined (WINCE)
- /* wince do not have GetSystemTimeAsFileTime */
- SYSTEMTIME stime;
- GetSystemTime(&stime);
- SystemTimeToFileTime(&stime,&ft.ft_ft);
-#else
/* number of 100-nsec units since Jan 1, 1601 */
GetSystemTimeAsFileTime(&ft.ft_ft);
-#endif
if (ft.ft_64 < EPOCH_BIAS) {
log_err(LD_GENERAL,"System time is before 1970; failing.");
exit(1);
diff --git a/src/common/compat.h b/src/common/compat.h
index ec7d2415e..635e427f0 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -56,21 +56,6 @@
#include <stdio.h>
#include <errno.h>
-#if defined (WINCE)
-#include <fcntl.h>
-#include <io.h>
-#include <math.h>
-#include <projects.h>
-/* this is not exported as W .... */
-#define SHGetPathFromIDListW SHGetPathFromIDList
-/* wcecompat has vasprintf */
-#define HAVE_VASPRINTF
-/* no service here */
-#ifdef NT_SERVICE
-#undef NT_SERVICE
-#endif
-#endif // WINCE
-
#ifndef NULL_REP_IS_ZERO_BYTES
#error "It seems your platform does not represent NULL as zero. We can't cope."
#endif
diff --git a/src/common/tortls.c b/src/common/tortls.c
index ea0f21cb2..e06a2ae94 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -16,10 +16,6 @@
#include "orconfig.h"
-#if defined (WINCE)
-#include <WinSock2.h>
-#endif
-
#include <assert.h>
#ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/
#ifndef _WIN32_WINNT
diff --git a/src/common/util.c b/src/common/util.c
index 2d7893b38..8589344db 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1893,7 +1893,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
}
if (check & CPD_CREATE) {
log_info(LD_GENERAL, "Creating directory %s", dirname);
-#if defined (_WIN32) && !defined (WINCE)
+#if defined (_WIN32)
r = mkdir(dirname);
#else
r = mkdir(dirname, 0700);