Include crtdefs.h instead of _mingw.h in the crt headers (like ms does), so only one header left (crtdefs.h) that includes a non-standard header

svn path=/trunk/; revision=38255
This commit is contained in:
Timo Kreuzer 2008-12-21 23:33:19 +00:00
parent 31733a5f8a
commit ff489f9473
49 changed files with 49 additions and 53 deletions

View file

@ -6,7 +6,7 @@
#ifndef __ASSERT_H_ #ifndef __ASSERT_H_
#define __ASSERT_H_ #define __ASSERT_H_
#include <_mingw.h> #include <crtdefs.h>
#ifdef __cplusplus #ifdef __cplusplus
#include <stdlib.h> #include <stdlib.h>
#endif #endif

View file

@ -26,8 +26,7 @@
#ifndef _COMPLEX_H_ #ifndef _COMPLEX_H_
#define _COMPLEX_H_ #define _COMPLEX_H_
/* All the headers include this file. */ #include <crtdefs.h>
#include <_mingw.h>
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
|| !defined __STRICT_ANSI__ || !defined __STRICT_ANSI__

View file

@ -6,7 +6,7 @@
#ifndef _INC_CONIO #ifndef _INC_CONIO
#define _INC_CONIO #define _INC_CONIO
#include <_mingw.h> #include <crtdefs.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View file

@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package. * This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package. * No warranty is given; refer to the file DISCLAIMER within this package.
*/ */
#include <_mingw.h> #include <crtdefs.h>
#ifndef _INC_CRTDBG #ifndef _INC_CRTDBG
#define _INC_CRTDBG #define _INC_CRTDBG

View file

@ -6,7 +6,7 @@
#ifndef _INC_CTYPE #ifndef _INC_CTYPE
#define _INC_CTYPE #define _INC_CTYPE
#include <_mingw.h> #include <crtdefs.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View file

@ -6,7 +6,7 @@
#ifndef _INC_DIRECT #ifndef _INC_DIRECT
#define _INC_DIRECT #define _INC_DIRECT
#include <_mingw.h> #include <crtdefs.h>
#include <io.h> #include <io.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -3,8 +3,7 @@
* This file is part of the w64 mingw-runtime package. * This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package. * No warranty is given; refer to the file DISCLAIMER within this package.
*/ */
/* All the headers include this file. */ #include <crtdefs.h>
#include <_mingw.h>
#ifndef __STRICT_ANSI__ #ifndef __STRICT_ANSI__

View file

@ -6,7 +6,7 @@
#ifndef _INC_DOS #ifndef _INC_DOS
#define _INC_DOS #define _INC_DOS
#include <_mingw.h> #include <crtdefs.h>
#include <io.h> #include <io.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -14,7 +14,7 @@
#include <emmintrin.h> #include <emmintrin.h>
#include <assert.h> #include <assert.h>
#include <fvec.h> #include <fvec.h>
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package. * This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package. * No warranty is given; refer to the file DISCLAIMER within this package.
*/ */
#include <_mingw.h> #include <crtdefs.h>
#ifndef _EH_H_ #ifndef _EH_H_
#define _EH_H_ #define _EH_H_

View file

@ -6,7 +6,7 @@
#ifndef _INC_ERRNO #ifndef _INC_ERRNO
#define _INC_ERRNO #define _INC_ERRNO
#include <_mingw.h> #include <crtdefs.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View file

@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package. * This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package. * No warranty is given; refer to the file DISCLAIMER within this package.
*/ */
#include <_mingw.h> #include <crtdefs.h>
#include <io.h> #include <io.h>

View file

@ -21,8 +21,7 @@
#ifndef _MINGW_FLOAT_H_ #ifndef _MINGW_FLOAT_H_
#define _MINGW_FLOAT_H_ #define _MINGW_FLOAT_H_
/* All the headers include this file. */ #include <crtdefs.h>
#include <_mingw.h>
/* /*
* Functions and definitions for controlling the FPU. * Functions and definitions for controlling the FPU.

View file

@ -6,7 +6,7 @@
#ifndef _INC_FPIEEE #ifndef _INC_FPIEEE
#define _INC_FPIEEE #define _INC_FPIEEE
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -14,7 +14,7 @@
#include <xmmintrin.h> #include <xmmintrin.h>
#include <assert.h> #include <assert.h>
#include <ivec.h> #include <ivec.h>
#include <_mingw.h> #include <crtdefs.h>
#if defined(_ENABLE_VEC_DEBUG) #if defined(_ENABLE_VEC_DEBUG)
#include <iostream> #include <iostream>

View file

@ -8,7 +8,7 @@
#ifndef _INTTYPES_H_ #ifndef _INTTYPES_H_
#define _INTTYPES_H_ #define _INTTYPES_H_
#include <_mingw.h> #include <crtdefs.h>
#include <stdint.h> #include <stdint.h>
#define __need_wchar_t #define __need_wchar_t
#include <stddef.h> #include <stddef.h>

View file

@ -6,7 +6,7 @@
#ifndef _IO_H_ #ifndef _IO_H_
#define _IO_H_ #define _IO_H_
#include <_mingw.h> #include <crtdefs.h>
#include <string.h> #include <string.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -14,7 +14,7 @@
#define _LIBGEN_H_ #define _LIBGEN_H_
/* All the headers include this file. */ /* All the headers include this file. */
#include <_mingw.h> #include <crtdefs.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View file

@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package. * This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package. * No warranty is given; refer to the file DISCLAIMER within this package.
*/ */
#include <_mingw.h> #include <crtdefs.h>
#ifndef _INC_LIMITS #ifndef _INC_LIMITS
#define _INC_LIMITS #define _INC_LIMITS

View file

@ -6,7 +6,7 @@
#ifndef _INC_LOCALE #ifndef _INC_LOCALE
#define _INC_LOCALE #define _INC_LOCALE
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -6,7 +6,7 @@
#ifndef _MALLOC_H_ #ifndef _MALLOC_H_
#define _MALLOC_H_ #define _MALLOC_H_
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -10,7 +10,7 @@
#pragma GCC system_header #pragma GCC system_header
#endif #endif
#include <_mingw.h> #include <crtdefs.h>
struct exception; struct exception;

View file

@ -6,7 +6,7 @@
#ifndef _INC_MBCTYPE #ifndef _INC_MBCTYPE
#define _INC_MBCTYPE #define _INC_MBCTYPE
#include <_mingw.h> #include <crtdefs.h>
#include <ctype.h> #include <ctype.h>
#ifdef __cplusplus #ifdef __cplusplus

View file

@ -6,7 +6,7 @@
#ifndef _INC_MBSTRING #ifndef _INC_MBSTRING
#define _INC_MBSTRING #define _INC_MBSTRING
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -6,7 +6,7 @@
#ifndef _INC_MEMORY #ifndef _INC_MEMORY
#define _INC_MEMORY #define _INC_MEMORY
#include <_mingw.h> #include <crtdefs.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View file

@ -10,7 +10,7 @@
#include <new> #include <new>
#include <_mingw.h> #include <crtdefs.h>
#pragma push_macro("new") #pragma push_macro("new")
#undef new #undef new

View file

@ -6,7 +6,7 @@
#ifndef _INC_PROCESS #ifndef _INC_PROCESS
#define _INC_PROCESS #define _INC_PROCESS
#include <_mingw.h> #include <crtdefs.h>
/* Includes a definition of _pid_t and pid_t */ /* Includes a definition of _pid_t and pid_t */
#include <sys/types.h> #include <sys/types.h>

View file

@ -6,7 +6,7 @@
#ifndef _INC_RTCAPI #ifndef _INC_RTCAPI
#define _INC_RTCAPI #define _INC_RTCAPI
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -6,7 +6,7 @@
#ifndef _INC_SEARCH #ifndef _INC_SEARCH
#define _INC_SEARCH #define _INC_SEARCH
#include <_mingw.h> #include <crtdefs.h>
#include <stddef.h> #include <stddef.h>
#ifdef __cplusplus #ifdef __cplusplus

View file

@ -6,7 +6,7 @@
#ifndef _INC_SETJMP #ifndef _INC_SETJMP
#define _INC_SETJMP #define _INC_SETJMP
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -6,7 +6,7 @@
#ifndef _INC_SIGNAL #ifndef _INC_SIGNAL
#define _INC_SIGNAL #define _INC_SIGNAL
#include <_mingw.h> #include <crtdefs.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View file

@ -4,7 +4,7 @@
* No warranty is given; refer to the file DISCLAIMER within this package. * No warranty is given; refer to the file DISCLAIMER within this package.
*/ */
#include <_mingw.h> #include <crtdefs.h>
#ifndef _INC_STDDEF #ifndef _INC_STDDEF
#define _INC_STDDEF #define _INC_STDDEF

View file

@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package. * This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package. * No warranty is given; refer to the file DISCLAIMER within this package.
*/ */
#include <_mingw.h> #include <crtdefs.h>
#ifndef _INC_STDEXCPT #ifndef _INC_STDEXCPT
#define _INC_STDEXCPT #define _INC_STDEXCPT

View file

@ -25,7 +25,7 @@
#ifndef _STDINT_H #ifndef _STDINT_H
#define _STDINT_H #define _STDINT_H
#include <_mingw.h> #include <crtdefs.h>
#define __need_wint_t #define __need_wint_t
#define __need_wchar_t #define __need_wchar_t

View file

@ -6,7 +6,7 @@
#ifndef _INC_STDIO #ifndef _INC_STDIO
#define _INC_STDIO #define _INC_STDIO
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -6,7 +6,7 @@
#ifndef _INC_STDLIB #ifndef _INC_STDLIB
#define _INC_STDLIB #define _INC_STDLIB
#include <_mingw.h> #include <crtdefs.h>
#include <limits.h> #include <limits.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -6,7 +6,7 @@
#ifndef _INC_STRING #ifndef _INC_STRING
#define _INC_STRING #define _INC_STRING
#include <_mingw.h> #include <crtdefs.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View file

@ -10,8 +10,7 @@
#error Only Win32 target is supported! #error Only Win32 target is supported!
#endif #endif
/* All the headers include this file. */ #include <crtdefs.h>
#include <_mingw.h>
#define _LK_UNLCK 0 #define _LK_UNLCK 0
#define _LK_LOCK 1 #define _LK_LOCK 1

View file

@ -10,7 +10,7 @@
#error Only Win32 target is supported! #error Only Win32 target is supported!
#endif #endif
#include <_mingw.h> #include <crtdefs.h>
#include <io.h> #include <io.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -6,7 +6,7 @@
#ifndef _TIMEB_H_ #ifndef _TIMEB_H_
#define _TIMEB_H_ #define _TIMEB_H_
#include <_mingw.h> #include <crtdefs.h>
#ifndef _WIN32 #ifndef _WIN32
#error Only Win32 target is supported! #error Only Win32 target is supported!

View file

@ -10,7 +10,7 @@
#error Only Win32 target is supported! #error Only Win32 target is supported!
#endif #endif
#include <_mingw.h> #include <crtdefs.h>
#ifdef _USE_32BIT_TIME_T #ifdef _USE_32BIT_TIME_T
#ifdef _WIN64 #ifdef _WIN64

View file

@ -10,7 +10,7 @@
#error Only Win32 target is supported! #error Only Win32 target is supported!
#endif #endif
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package. * This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package. * No warranty is given; refer to the file DISCLAIMER within this package.
*/ */
#include <_mingw.h> #include <crtdefs.h>
#ifndef _INC_TCHAR #ifndef _INC_TCHAR
#define _INC_TCHAR #define _INC_TCHAR

View file

@ -6,7 +6,7 @@
#ifndef _TIME_H_ #ifndef _TIME_H_
#define _TIME_H_ #define _TIME_H_
#include <_mingw.h> #include <crtdefs.h>
#ifndef _WIN32 #ifndef _WIN32
#error Only Win32 target is supported! #error Only Win32 target is supported!

View file

@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package. * This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package. * No warranty is given; refer to the file DISCLAIMER within this package.
*/ */
#include <_mingw.h> #include <crtdefs.h>
#ifndef _INC_TYPEINFO #ifndef _INC_TYPEINFO
#define _INC_TYPEINFO #define _INC_TYPEINFO

View file

@ -10,7 +10,7 @@
#error Only Win32 target is supported! #error Only Win32 target is supported!
#endif #endif
#include <_mingw.h> #include <crtdefs.h>
#undef _CRT_PACKING #undef _CRT_PACKING
#define _CRT_PACKING 8 #define _CRT_PACKING 8

View file

@ -6,7 +6,7 @@
#ifndef _INC_WCHAR #ifndef _INC_WCHAR
#define _INC_WCHAR #define _INC_WCHAR
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -10,7 +10,7 @@
#error Only Win32 target is supported! #error Only Win32 target is supported!
#endif #endif
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)

View file

@ -6,7 +6,7 @@
#ifndef _YVALS #ifndef _YVALS
#define _YVALS #define _YVALS
#include <_mingw.h> #include <crtdefs.h>
#pragma pack(push,_CRT_PACKING) #pragma pack(push,_CRT_PACKING)