Alexandre Julliard : include/msvcrt: Fix all definitions of size_t for Win64.
Module: wine Branch: refs/heads/master Commit: 945292737b15f6196c7485617cea95ebc35d959c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=945292737b15f6196c748561... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 12:28:25 2006 +0200 include/msvcrt: Fix all definitions of size_t for Win64. --- include/msvcrt/direct.h | 8 ++++++++ include/msvcrt/malloc.h | 7 +++++++ include/msvcrt/mbstring.h | 8 ++++++++ include/msvcrt/search.h | 8 ++++++++ include/msvcrt/stdio.h | 13 ++++++++----- include/msvcrt/stdlib.h | 10 ++++++---- include/msvcrt/sys/types.h | 8 ++++++++ include/msvcrt/time.h | 8 ++++++++ include/msvcrt/wchar.h | 14 ++++++++------ 9 files changed, 69 insertions(+), 15 deletions(-) diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h index 76ad31b..bd05db9 100644 --- a/include/msvcrt/direct.h +++ b/include/msvcrt/direct.h @@ -22,8 +22,16 @@ typedef unsigned short wchar_t; #endif #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index deb6199..eff45e8 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -34,9 +34,16 @@ #define _HEAPBADPTR -6 #define _FREEENTRY 0 #define _USEDENTRY 1 +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index de4032b..f47a4c0 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -23,8 +23,16 @@ #ifndef __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/search.h b/include/msvcrt/search.h index 8337856..c3a2e50 100644 --- a/include/msvcrt/search.h +++ b/include/msvcrt/search.h @@ -23,8 +23,16 @@ #ifndef __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index b1c8043..bc58de3 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -11,15 +11,14 @@ #ifndef __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT #endif -#if !defined(_MSC_VER) && !defined(__int64) -/* FIXME: not compatible, but needed for __int64 definition */ -#include <basetsd.h> -#endif - #ifndef RC_INVOKED #include <stdarg.h> #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + /* file._flag flags */ #define _IOREAD 0x0001 #define _IOWRT 0x0002 @@ -81,7 +80,11 @@ #define _FPOS_T_DEFINED #endif #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index d903500..a8b6ab5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -26,10 +26,8 @@ typedef unsigned short wchar_t; #endif #endif -#ifndef _MSC_VER -# ifndef __int64 -# define __int64 long long -# endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long #endif #define EXIT_SUCCESS 0 @@ -56,7 +54,11 @@ typedef struct _ldiv_t { } ldiv_t; #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h index 1cc1e66..fc6f269 100644 --- a/include/msvcrt/sys/types.h +++ b/include/msvcrt/sys/types.h @@ -23,6 +23,10 @@ #ifndef __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _DEV_T_DEFINED typedef unsigned int _dev_t; #define _DEV_T_DEFINED @@ -67,7 +71,11 @@ #define _PID_T_DEFINED #endif #ifndef _SSIZE_T_DEFINED +#ifdef _WIN64 +typedef __int64 ssize_t; +#else typedef int ssize_t; +#endif #define _SSIZE_T_DEFINED #endif diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 8b9e2ab..b2caa03 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -30,8 +30,16 @@ typedef unsigned short wchar_t; #endif #endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 73db7f8..81982e2 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -35,10 +35,18 @@ #endif #define WCHAR_MIN 0 #define WCHAR_MAX ((wchar_t)-1) +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + typedef int mbstate_t; #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif @@ -48,12 +56,6 @@ typedef unsigned short wctype_t; #define _WCTYPE_T_DEFINED #endif -#ifndef _MSC_VER -# ifndef __int64 -# define __int64 long long -# endif -#endif - #ifndef WEOF #define WEOF (wint_t)(0xFFFF) #endif
participants (1)
-
Alexandre Julliard