moved wince related includes and defs to compat.h where possible, removed unused...

diff --git a/src/common/compat.c b/src/common/compat.c
index f93a1619cec5c352cc99244ea9e0071797da2c26..066623b8325b725969243ba427073339162cd10f 100644 (file)
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -22,10 +22,8 @@
 #ifdef MS_WINDOWS
 #include <process.h>
 #include <windows.h>
-#if !defined (WINCE)
 #include <sys/locking.h>
 #endif
-#endif
 
 #ifdef HAVE_UNAME
 #include <sys/utsname.h>

diff --git a/src/common/compat.h b/src/common/compat.h
index 077256e401d5f516c28eb80a3fb5a5119ee1aa1d..7d59501e2b5953fb910e085c44692bc1804c5012 100644 (file)
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -51,6 +51,22 @@
 #include <netinet6/in6.h>
 #endif
 
+#if defined (WINCE)
+#include <fcntl.h>
+#include <io.h>
+#include <math.h>
+#include <projects.h>
+#define snprintf _snprintf
+/* 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 218f110d8cc863c4b2408778e9fdd0317deb0ebc..6732d55b8aaaf00dbe1329168aadcfd4d047af5c 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -16,6 +16,10 @@
 
 #include "orconfig.h"
 
+#if defined (WINCE)
+#include <WinSock2.h>
+#endif
+
 #include <assert.h>
 #include <openssl/ssl.h>
 #include <openssl/ssl3.h>

diff --git a/src/or/main.c b/src/or/main.c
index 542383526c7e1c3693f1936582a9ebd68f756697..0c3e6d542505bec9878cdd99c52c4ab63c8b8bea 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -24,10 +24,6 @@
 #include <event.h>
 #endif
 
-#if defined (WINCE)
-#include <projects.h>
-#endif
-
 void evdns_shutdown(int);
 
 /********* PROTOTYPES **********/

diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 4915597c017a8d2d7fe378dc68fbe50732bd9756..0a9ecfd224a70cdbac37b503296df7ffbcb5ef61 100644 (file)
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -88,11 +88,18 @@
 #define HAVE_STRING_H
 
 /* Define to 1 if you have the `strlcat' function. */
+#if defined (WINCE)
+#define HAVE_STRLCAT
+#else
 #undef HAVE_STRLCAT
+#endif
 
 /* Define to 1 if you have the `strlcpy' function. */
+#if defined (WINCE)
+#define HAVE_STRLCPY
+#else
 #undef HAVE_STRLCPY
-
+#endif
 /* Define to 1 if you have the `strptime' function. */
 #undef HAVE_STRPTIME