include: Add the msvcrt/crtdefs.h header and include it where needed.

oldstable
Alexandre Julliard 2008-12-11 22:37:34 +01:00
parent 7a6c6747a9
commit 33fa6c2e25
34 changed files with 192 additions and 560 deletions

View File

@ -290,6 +290,7 @@ SRCDIR_INCLUDES = \
mstcpip.h \
msvcrt/conio.h \
msvcrt/crtdbg.h \
msvcrt/crtdefs.h \
msvcrt/ctype.h \
msvcrt/direct.h \
msvcrt/dirent.h \

View File

@ -7,9 +7,8 @@
*/
#ifndef __WINE_CONIO_H
#define __WINE_CONIO_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {

View File

@ -19,9 +19,8 @@
*/
#ifndef __WINE_CRTDBG_H_
#define __WINE_CRTDBG_H_
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
/* The debug API is not implemented in Winelib.
* Redirect everything to the regular APIs.

View File

@ -0,0 +1,133 @@
/*
* CRT definitions
*
* Copyright 2000 Francois Gouget.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef __stdcall
# ifdef __i386__
# ifdef __GNUC__
# ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */
# define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))
# else
# define __stdcall __attribute__((__stdcall__))
# endif
# elif defined(_MSC_VER)
/* Nothing needs to be done. __stdcall already exists */
# else
# error You need to define __stdcall for your compiler
# endif
# elif defined(__x86_64__) && defined (__GNUC__)
# define __stdcall __attribute__((ms_abi))
# else
# define __stdcall
# endif
#endif /* __stdcall */
#ifndef __cdecl
# if defined(__i386__) && defined(__GNUC__)
# ifdef __APPLE__ /* Mac OS X uses 16-byte aligned stack and not a 4-byte one */
# define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))
# else
# define __cdecl __attribute__((__cdecl__))
# endif
# elif defined(__x86_64__) && defined (__GNUC__)
# define __cdecl __attribute__((ms_abi))
# elif !defined(_MSC_VER)
# define __cdecl
# endif
#endif /* __cdecl */
#ifndef _INTPTR_T_DEFINED
#ifdef _WIN64
typedef __int64 intptr_t;
#else
typedef int intptr_t;
#endif
#define _INTPTR_T_DEFINED
#endif
#ifndef _UINTPTR_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 uintptr_t;
#else
typedef unsigned int uintptr_t;
#endif
#define _UINTPTR_T_DEFINED
#endif
#ifndef _PTRDIFF_T_DEFINED
#ifdef _WIN64
typedef __int64 ptrdiff_t;
#else
typedef int ptrdiff_t;
#endif
#define _PTRDIFF_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
#ifndef _TIME_T_DEFINED
typedef long time_t;
#define _TIME_T_DEFINED
#endif
#ifndef _TIME32_T_DEFINED
typedef long __time32_t;
#define _TIME32_T_DEFINED
#endif
#ifndef _TIME64_T_DEFINED
typedef __int64 __time64_t;
#define _TIME64_T_DEFINED
#endif
#ifndef _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#define _WCHAR_T_DEFINED
#endif
#ifndef _WCTYPE_T_DEFINED
typedef unsigned short wint_t;
typedef unsigned short wctype_t;
#define _WCTYPE_T_DEFINED
#endif

View File

@ -7,31 +7,17 @@
*/
#ifndef __WINE_CTYPE_H
#define __WINE_CTYPE_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#ifndef WEOF
#define WEOF (wint_t)(0xFFFF)
#endif
#ifndef _WCTYPE_T_DEFINED
typedef unsigned short wint_t;
typedef unsigned short wctype_t;
#define _WCTYPE_T_DEFINED
#endif
/* ASCII char classification table - binary compatible */
#define _UPPER 0x0001 /* C1_UPPER */
#define _LOWER 0x0002 /* C1_LOWER */

View File

@ -7,9 +7,8 @@
*/
#ifndef __WINE_DIRECT_H
#define __WINE_DIRECT_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>
@ -17,34 +16,6 @@
extern "C" {
#endif
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef _SIZE_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 size_t;
#else
typedef unsigned int size_t;
#endif
#define _SIZE_T_DEFINED
#endif
#ifndef _DISKFREE_T_DEFINED
#define _DISKFREE_T_DEFINED
struct _diskfree_t {

View File

@ -7,9 +7,8 @@
*/
#ifndef __WINE_DOS_H
#define __WINE_DOS_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>

View File

@ -19,9 +19,8 @@
*/
#ifndef __WINE_EH_H
#define __WINE_EH_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#if !defined(__cplusplus) && !defined(__WINE_MSVCRT_TEST)
#error "eh.h is meant only for C++ applications"

View File

@ -18,9 +18,8 @@
#ifndef __WINE_ERRNO_H
#define __WINE_ERRNO_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
# define EPERM 1
# define ENOENT 2

View File

@ -7,9 +7,8 @@
*/
#ifndef __WINE_FCNTL_H
#define __WINE_FCNTL_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#define _O_RDONLY 0
#define _O_WRONLY 1

View File

@ -8,9 +8,8 @@
#ifndef __WINE_FLOAT_H
#define __WINE_FLOAT_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {

View File

@ -7,31 +7,11 @@
*/
#ifndef __WINE_IO_H
#define __WINE_IO_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
/* The following are also defined in dos.h */
#define _A_NORMAL 0x00000000
#define _A_RDONLY 0x00000001
@ -41,11 +21,6 @@ typedef unsigned short wchar_t;
#define _A_SUBDIR 0x00000010
#define _A_ARCH 0x00000020
#ifndef _TIME_T_DEFINED
typedef long time_t;
#define _TIME_T_DEFINED
#endif
#ifndef _FSIZE_T_DEFINED
typedef unsigned long _fsize_t;
#define _FSIZE_T_DEFINED

View File

@ -1,6 +1,8 @@
#ifndef __WINE_LIMITS_H
#define __WINE_LIMITS_H
#include <crtdefs.h>
#define CHAR_BIT 8
#define MB_LEN_MAX 2

View File

@ -19,16 +19,8 @@
*/
#ifndef __WINE_LOCALE_H
#define __WINE_LOCALE_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#include <crtdefs.h>
#define LC_ALL 0
#define LC_COLLATE 1

View File

@ -19,9 +19,8 @@
*/
#ifndef __WINE_MALLOC_H
#define __WINE_MALLOC_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
/* heap function constants */
#define _HEAPEMPTY -1
@ -34,27 +33,6 @@
#define _FREEENTRY 0
#define _USEDENTRY 1
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef _SIZE_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 size_t;
#else
typedef unsigned int size_t;
#endif
#define _SIZE_T_DEFINED
#endif
#ifndef _HEAPINFO_DEFINED
#define _HEAPINFO_DEFINED
typedef struct _heapinfo

View File

@ -8,9 +8,8 @@
#ifndef __WINE_MATH_H
#define __WINE_MATH_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>

View File

@ -19,9 +19,8 @@
*/
#ifndef __WINE_MBCTYPE_H
#define __WINE_MBCTYPE_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {

View File

@ -19,33 +19,11 @@
*/
#ifndef __WINE_MBSTRING_H
#define __WINE_MBSTRING_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef _SIZE_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 size_t;
#else
typedef unsigned int size_t;
#endif
#define _SIZE_T_DEFINED
#endif
#ifndef _NLSCMP_DEFINED
#define _NLSCMPERROR ((unsigned int)0x7fffffff)
#define _NLSCMP_DEFINED

View File

@ -7,30 +7,8 @@
*/
#ifndef __WINE_MEMORY_H
#define __WINE_MEMORY_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef _SIZE_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 size_t;
#else
typedef unsigned int size_t;
#endif
#define _SIZE_T_DEFINED
#endif
#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {

View File

@ -7,16 +7,8 @@
*/
#ifndef __WINE_PROCESS_H
#define __WINE_PROCESS_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#include <crtdefs.h>
/* Process creation flags */
#define _P_WAIT 0
@ -28,26 +20,6 @@ typedef unsigned short wchar_t;
#define _WAIT_CHILD 0
#define _WAIT_GRANDCHILD 1
#ifndef __stdcall
# ifdef __i386__
# ifdef __GNUC__
# ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */
# define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))
# else
# define __stdcall __attribute__((__stdcall__))
# endif
# elif defined(_MSC_VER)
/* Nothing needs to be done. __stdcall already exists */
# else
# error You need to define __stdcall for your compiler
# endif
# elif defined(__x86_64__) && defined (__GNUC__)
# define __stdcall __attribute__((ms_abi))
# else
# define __stdcall
# endif
#endif /* __stdcall */
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -19,31 +19,8 @@
*/
#ifndef __WINE_SEARCH_H
#define __WINE_SEARCH_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef _SIZE_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 size_t;
#else
typedef unsigned int size_t;
#endif
#define _SIZE_T_DEFINED
#endif
#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {

View File

@ -19,9 +19,8 @@
*/
#ifndef __WINE_SETJMP_H
#define __WINE_SETJMP_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>

View File

@ -19,9 +19,8 @@
*/
#ifndef _WINE_SIGNAL_H
#define _WINE_SIGNAL_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#define SIGINT 2
#define SIGILL 4

View File

@ -19,64 +19,8 @@
*/
#ifndef __WINE_STDDEF_H
#define __WINE_STDDEF_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#ifndef _INTPTR_T_DEFINED
#ifdef _WIN64
typedef __int64 intptr_t;
#else
typedef int intptr_t;
#endif
#define _INTPTR_T_DEFINED
#endif
#ifndef _UINTPTR_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 uintptr_t;
#else
typedef unsigned int uintptr_t;
#endif
#define _UINTPTR_T_DEFINED
#endif
#ifndef _PTRDIFF_T_DEFINED
#ifdef _WIN64
typedef __int64 ptrdiff_t;
#else
typedef int ptrdiff_t;
#endif
#define _PTRDIFF_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
#include <crtdefs.h>
#ifndef NULL
#ifdef __cplusplus

View File

@ -7,27 +7,14 @@
*/
#ifndef __WINE_STDIO_H
#define __WINE_STDIO_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <pshpack8.h>
#include <crtdefs.h>
#ifndef RC_INVOKED
#include <stdarg.h>
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#include <pshpack8.h>
/* file._flag flags */
#define _IOREAD 0x0001
@ -89,28 +76,6 @@ typedef __int64 fpos_t;
#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
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#ifndef _WCTYPE_T_DEFINED
typedef unsigned short wint_t;
typedef unsigned short wctype_t;
#define _WCTYPE_T_DEFINED
#endif
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -7,9 +7,8 @@
*/
#ifndef __WINE_STDLIB_H
#define __WINE_STDLIB_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>
@ -21,14 +20,6 @@
#endif
#endif
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
typedef struct
{
float f;
@ -44,18 +35,6 @@ typedef struct
unsigned char ld[10];
} _LDOUBLE;
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#define EXIT_SUCCESS 0
#define EXIT_FAILURE -1
#define RAND_MAX 0x7FFF
@ -79,15 +58,6 @@ typedef struct _ldiv_t {
long rem;
} 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
#define __max(a,b) (((a) > (b)) ? (a) : (b))
#define __min(a,b) (((a) < (b)) ? (a) : (b))
#ifndef __cplusplus

View File

@ -7,37 +7,8 @@
*/
#ifndef __WINE_STRING_H
#define __WINE_STRING_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef _SIZE_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 size_t;
#else
typedef unsigned int size_t;
#endif
#define _SIZE_T_DEFINED
#endif
#include <crtdefs.h>
#ifndef _NLSCMP_DEFINED
#define _NLSCMPERROR ((unsigned int)0x7fffffff)

View File

@ -7,20 +7,11 @@
*/
#ifndef __WINE_SYS_STAT_H
#define __WINE_SYS_STAT_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <pshpack8.h>
#include <crtdefs.h>
#include <sys/types.h>
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#include <pshpack8.h>
#ifndef _DEV_T_DEFINED
typedef unsigned int _dev_t;
@ -32,11 +23,6 @@ typedef unsigned short _ino_t;
#define _INO_T_DEFINED
#endif
#ifndef _TIME_T_DEFINED
typedef long time_t;
#define _TIME_T_DEFINED
#endif
#ifndef _OFF_T_DEFINED
typedef int _off_t;
#define _OFF_T_DEFINED

View File

@ -19,17 +19,11 @@
*/
#ifndef __WINE_SYS_TIMEB_H
#define __WINE_SYS_TIMEB_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>
#ifndef _TIME_T_DEFINED
typedef long time_t;
#define _TIME_T_DEFINED
#endif
#ifndef _TIMEB_DEFINED
#define _TIMEB_DEFINED
struct _timeb

View File

@ -19,21 +19,8 @@
*/
#ifndef __WINE_SYS_TYPES_H
#define __WINE_SYS_TYPES_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#include <crtdefs.h>
#ifndef _DEV_T_DEFINED
typedef unsigned int _dev_t;
@ -55,16 +42,6 @@ typedef int _off_t;
#define _OFF_T_DEFINED
#endif
#ifndef _TIME_T_DEFINED
typedef long time_t;
#define _TIME_T_DEFINED
#endif
#ifndef _TIME64_T_DEFINED
#define _TIME64_T_DEFINED
typedef __int64 __time64_t;
#endif
#ifndef _BSDTYPES_DEFINED
typedef unsigned char u_char;
typedef unsigned short u_short;

View File

@ -19,24 +19,11 @@
*/
#ifndef __WINE_SYS_UTIME_H
#define __WINE_SYS_UTIME_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#ifndef _TIME_T_DEFINED
typedef long time_t;
#define _TIME_T_DEFINED
#endif
#ifndef _UTIMBUF_DEFINED
#define _UTIMBUF_DEFINED
struct _utimbuf

View File

@ -19,45 +19,11 @@
*/
#ifndef __WINE_TIME_H
#define __WINE_TIME_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef _SIZE_T_DEFINED
#ifdef _WIN64
typedef unsigned __int64 size_t;
#else
typedef unsigned int size_t;
#endif
#define _SIZE_T_DEFINED
#endif
#ifndef _TIME_T_DEFINED
typedef long time_t;
#define _TIME_T_DEFINED
#endif
#ifndef _CLOCK_T_DEFINED
typedef long clock_t;
#define _CLOCK_T_DEFINED

View File

@ -7,25 +7,16 @@
*/
#ifndef __WINE_WCHAR_H
#define __WINE_WCHAR_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <stdarg.h>
#include <pshpack8.h>
#include <stdarg.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
@ -37,18 +28,6 @@ typedef unsigned short wchar_t;
#define WCHAR_MIN 0
#define WCHAR_MAX ((wchar_t)-1)
#if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64
#endif
#if !defined(_MSC_VER) && !defined(__int64)
# if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long
# else
# define __int64 long long
# endif
#endif
#ifndef DECLSPEC_ALIGN
# if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS)
# define DECLSPEC_ALIGN(x) __declspec(align(x))
@ -61,21 +40,6 @@ typedef unsigned short wchar_t;
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
#ifndef _WCTYPE_T_DEFINED
typedef unsigned short wint_t;
typedef unsigned short wctype_t;
#define _WCTYPE_T_DEFINED
#endif
#ifndef WEOF
#define WEOF (wint_t)(0xFFFF)
#endif
@ -100,16 +64,6 @@ typedef int _off_t;
#define _OFF_T_DEFINED
#endif
#ifndef _TIME_T_DEFINED
typedef long time_t;
#define _TIME_T_DEFINED
#endif
#ifndef _TIME64_T_DEFINED
#define _TIME64_T_DEFINED
typedef __int64 __time64_t;
#endif
#ifndef _TM_DEFINED
#define _TM_DEFINED
struct tm {

View File

@ -19,19 +19,11 @@
*/
#ifndef __WINE_WCTYPE_H
#define __WINE_WCTYPE_H
#ifndef __WINE_USE_MSVCRT
#define __WINE_USE_MSVCRT
#endif
#include <crtdefs.h>
#include <pshpack8.h>
#ifndef _WCHAR_T_DEFINED
#define _WCHAR_T_DEFINED
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
#endif
/* ASCII char classification table - binary compatible */
#define _UPPER 0x0001 /* C1_UPPER */
#define _LOWER 0x0002 /* C1_LOWER */
@ -48,12 +40,6 @@ typedef unsigned short wchar_t;
#define WEOF (wint_t)(0xFFFF)
#endif
#ifndef _WCTYPE_T_DEFINED
typedef unsigned short wint_t;
typedef unsigned short wctype_t;
#define _WCTYPE_T_DEFINED
#endif
/* FIXME: there's something to do with __p__pctype and __p__pwctype */