From 6dfaa9b3a550779dfbed84e643ea301837dcdeb1 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 15 Jun 2005 19:45:28 +0000
Subject: [PATCH] some magic to make w32api happy when using a [arch]-linux
 compiler rather than mingw32

svn path=/trunk/; revision=15924
---
 reactos/w32api/include/winnt.h    | 3 +++
 reactos/w32api/include/winsock2.h | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/reactos/w32api/include/winnt.h b/reactos/w32api/include/winnt.h
index 1d637647b7b..388962636f2 100644
--- a/reactos/w32api/include/winnt.h
+++ b/reactos/w32api/include/winnt.h
@@ -19,6 +19,9 @@
 #define _X86_
 #elif defined(_M_ALPHA) && !defined(_ALPHA_)
 #define _ALPHA_
+
+#elif defined(_M_ARM) && !defined(ARM)
+#define ARM
 #elif defined(_M_PPC) && !defined(_PPC_)
 #define _PPC_
 #elif defined(_M_MRX000) && !defined(_MIPS_)
diff --git a/reactos/w32api/include/winsock2.h b/reactos/w32api/include/winsock2.h
index a23000b0608..30980ee7ff0 100644
--- a/reactos/w32api/include/winsock2.h
+++ b/reactos/w32api/include/winsock2.h
@@ -96,8 +96,10 @@ if (__i == ((fd_set *)(set))->fd_count) {\
     This may cause runtime problems with W32 sockets"
 #endif /* ndef _SYS_TYPES_FD_SET */
 #if !(defined (__INSIDE_CYGWIN__) || (__INSIDE_MSYS__))
-#ifndef _TIMEVAL_DEFINED /* also in sys/time.h */
+#ifndef _TIMEVAL_DEFINED
+/* also in sys/time.h */
 #define _TIMEVAL_DEFINED
+#define _STRUCT_TIMEVAL
 struct timeval {
 	long    tv_sec;
 	long    tv_usec;
@@ -562,7 +564,10 @@ u_long PASCAL htonl(u_long);
 u_long PASCAL ntohl(u_long);
 u_short PASCAL htons(u_short);
 u_short PASCAL ntohs(u_short);
+#ifndef _SYS_SELECT_H /* Work around for Linux Compilers */ 
+#define _SYS_SELECT_H
 int PASCAL select(int nfds,fd_set*,fd_set*,fd_set*,const struct timeval*);
+#endif
 #endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
 
 int PASCAL gethostname(char*,int);