From 6043e97ff0ebecb7ea7605728e7353c4ef69b0c8 Mon Sep 17 00:00:00 2001 From: Samuel Serapion Date: Fri, 14 Nov 2008 05:51:46 +0000 Subject: [PATCH] Correct definitions for WIN32 and WIN64. svn path=/branches/ros-amd64-bringup/; revision=37352 --- reactos/include/crt/mingw32/stddef.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/reactos/include/crt/mingw32/stddef.h b/reactos/include/crt/mingw32/stddef.h index 60b6a28bb0c..162a3bae4da 100644 --- a/reactos/include/crt/mingw32/stddef.h +++ b/reactos/include/crt/mingw32/stddef.h @@ -140,7 +140,11 @@ _TYPE_wchar_t; #define ___int_ptrdiff_t_h #define _GCC_PTRDIFF_T #ifndef __PTRDIFF_TYPE__ -#define __PTRDIFF_TYPE__ long long int +# ifdef _WIN64 + #define __PTRDIFF_TYPE__ long long int +# else +# #define __PTRDIFF_TYPE__ long int +# endif #endif #ifndef _PTRDIFF_T_DEFINED #define _PTRDIFF_T_DEFINED @@ -204,7 +208,11 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; #define __size_t #endif #ifndef __SIZE_TYPE__ -#define __SIZE_TYPE__ long long unsigned int +# ifdef _WIN64 +# define __SIZE_TYPE__ long long unsigned int +# else +# define __SIZE_TYPE__ long unsigned int +# endif #endif #if !(defined (__GNUG__) && defined (size_t)) typedef __SIZE_TYPE__ size_t; @@ -379,12 +387,12 @@ typedef __WCHAR_TYPE__ wchar_t; #endif /* NULL not defined and or need NULL. */ #undef __need_NULL -#ifdef _STDDEF_H +#ifndef offsetof /* Offset of member MEMBER in a struct of type TYPE. */ #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) -#endif /* _STDDEF_H was defined this time */ +#endif /* !offsetof */ #endif /* !_STDDEF_H && !_STDDEF_H_ && !_ANSI_STDDEF_H && !__STDDEF_H__ || __need_XXX was not defined before */