[ros-diffs] [spetreolle] 26824: freebsd/linux/other unixes build fixes

[spetreolle at svn.reactos.org]

Author: spetreolle
Date: Thu May 17 22:46:31 2007
New Revision: 26824

URL: http://svn.reactos.org/svn/reactos?rev=26824&view=rev
Log:
freebsd/linux/other unixes build fixes

Modified:
    trunk/reactos/include/psdk/winnt.h
    trunk/reactos/tools/rsym.h
    trunk/reactos/tools/wrc/genres.c

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=26824&r1=26823&r2=26824&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h (original)
+++ trunk/reactos/include/psdk/winnt.h Thu May 17 22:46:31 2007
@@ -120,11 +120,14 @@
 
 #ifndef _WCHAR_T_DEFINED
 #define _WCHAR_T_DEFINED
+#ifndef _WCHAR_T_DECLARED      /* for FreeBSD 5 and later */
+#define _WCHAR_T_DECLARED
 #ifndef _WCHAR_T_
 #define _WCHAR_T_
 #undef __need_wchar_t
 #ifndef __cplusplus
 typedef unsigned short wchar_t;
+#endif
 #endif
 #endif
 #endif
@@ -1841,7 +1844,7 @@
 } ACL_SIZE_INFORMATION;
 
 /* FIXME: add more machines */
-#if defined(_X86_) || defined(linux)
+#if defined(_X86_) || defined(unix)
 #define SIZE_OF_80387_REGISTERS	80
 #define CONTEXT_i386	0x10000
 #define CONTEXT_i486	0x10000

Modified: trunk/reactos/tools/rsym.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=26824&r1=26823&r2=26824&view=diff
==============================================================================
--- trunk/reactos/tools/rsym.h (original)
+++ trunk/reactos/tools/rsym.h Thu May 17 22:46:31 2007
@@ -14,7 +14,7 @@
 typedef unsigned char UCHAR;
 typedef unsigned short WORD;
 typedef unsigned short USHORT;
-#if defined(__x86_64__) && defined(linux)
+#if defined(__x86_64__) && defined(unix)
 typedef signed int LONG;
 typedef unsigned int ULONG;
 typedef unsigned int DWORD;
@@ -26,7 +26,7 @@
 #if defined(_WIN64)
 typedef unsigned __int64 ULONG_PTR;
 #else
-#if defined(__x86_64__) && defined(linux)
+#if defined(__x86_64__) && defined(unix)
 typedef  unsigned int  ULONG_PTR;
 #else
 typedef  unsigned long ULONG_PTR;

Modified: trunk/reactos/tools/wrc/genres.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/genres.c?rev=26824&r1=26823&r2=26824&view=diff
==============================================================================
--- trunk/reactos/tools/wrc/genres.c (original)
+++ trunk/reactos/tools/wrc/genres.c Thu May 17 22:46:31 2007
@@ -44,7 +44,7 @@
 #include "wine/unicode.h"
 
 /* Fix 64-bit host, re: put_dword */
-#if defined(linux) && defined(__x86_64__)
+#if defined(unix) && defined(__x86_64__)
 typedef unsigned int HOST_DWORD;
 #else
 typedef unsigned long HOST_DWORD;