Merge from amd64 branch:

46478
[CRT]
- define _CRTBLD
- rename float_t/double_t/long_double_t to float_s/double_s/long_double_s to avoid name conflicts

46511
[FREELDR]
snprintf -> _snprintf

46534
[CRT]
- Set crt="static" in freeldr, rtl, bmfs, ftfd, rtl, mini_hal
- define "CRTDLL" in ntdll, crtdll, msvcrt, msvcrt20, msvcrt40

46535
[CRT HEADERS]
- add _mingw_mac.h from ming-w64 and include it into _mingw.h
- Update _CRTIMP definition
- Fix definition of _wctype
- onexit is not _CRTIMP

46537
[MINGW]
Update mingw library to mingw-w64 trunk (mingw-w64-src_20100325)

46538
Apply MSVC compilation fix.

46539
[MINGW]
Apply MSVC compilation fixes

svn path=/trunk/; revision=46597
This commit is contained in:
Timo Kreuzer 2010-03-30 13:30:36 +00:00
commit 794e740131
82 changed files with 1700 additions and 629 deletions

View file

@ -25,6 +25,7 @@
<define name="_MSVCRT_LIB_" />
<define name="_MSVCRT_" />
<define name="_MT" />
<define name="_CRTBLD" />
<directory name="conio">
<file>cgets.c</file>
<file>cprintf.c</file>

View file

@ -94,7 +94,7 @@ _XcptFilter(DWORD ExceptionCode,
return ret;
}
int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
int CDECL __CppXcptFilter(unsigned long ex, PEXCEPTION_POINTERS ptr)
{
/* only filter c++ exceptions */
if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH;

View file

@ -20,7 +20,7 @@ double _chgsign( double __x )
union
{
double* __x;
double_t *x;
double_s *x;
} u;
u.__x = &__x;

View file

@ -19,12 +19,12 @@ double _copysign (double __d, double __s)
union
{
double* __d;
double_t* d;
double_s* d;
} d;
union
{
double* __s;
double_t* s;
double_s* s;
} s;
d.__d = &__d;
s.__s = &__s;

View file

@ -25,7 +25,7 @@
#define _FPCLASS_PINF 0x0200 /* positive infinity */
#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3
//#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3
#define FP_SNAN 0x0001 // signaling NaN
#define FP_QNAN 0x0002 // quiet NaN
@ -38,7 +38,7 @@
#define FP_NNORM 0x0080 // negative normalized non-zero
#define FP_PNORM 0x0100 // positive normalized non-zero
#endif
//#endif
typedef int fpclass_t;
@ -50,7 +50,7 @@ fpclass_t _fpclass(double __d)
union
{
double* __d;
double_t* d;
double_s* d;
} d;
d.__d = &__d;

View file

@ -28,7 +28,7 @@ int _isnan(double __x)
union
{
double* __x;
double_t* x;
double_s* x;
} x;
x.__x = &__x;
return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 ));
@ -41,7 +41,7 @@ int _isnanl(long double __x)
union
{
long double* __x;
long_double_t* x;
long_double_s* x;
} x;
x.__x = &__x;
@ -59,7 +59,7 @@ int _isinf(double __x)
union
{
double* __x;
double_t* x;
double_s* x;
} x;
x.__x = &__x;
@ -81,7 +81,7 @@ int _isinfl(long double __x)
union
{
long double* __x;
long_double_t* x;
long_double_s* x;
} x;
x.__x = &__x;

View file

@ -19,7 +19,7 @@ double _scalb( double __x, long e )
union
{
double* __x;
double_t* x;
double_s* x;
} x;
x.__x = &__x;

View file

@ -5,14 +5,14 @@ typedef struct {
unsigned int mantissa:23;
unsigned int exponent:8;
unsigned int sign:1;
} float_t;
} float_s;
typedef struct {
unsigned int mantissal:32;
unsigned int mantissah:20;
unsigned int exponent:11;
unsigned int sign:1;
} double_t;
} double_s;
typedef struct {
unsigned int mantissal:32;
@ -20,6 +20,6 @@ typedef struct {
unsigned int exponent:15;
unsigned int sign:1;
unsigned int empty:16;
} long_double_t;
} long_double_s;
#endif

View file

@ -7,6 +7,7 @@
<define name="_NTSYSTEM_" />
<define name="_NTDLLBUILD_" />
<define name="_LIBCNT_" />
<define name="_CRTBLD" />
<if property="ARCH" value="i386">
<define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define>
</if>

View file

@ -11,7 +11,7 @@ frexp(double __x, int *exptr)
union
{
double* __x;
double_t* x;
double_s* x;
} x;
x.__x = &__x;

View file

@ -3,4 +3,4 @@
#include <internal/ieee.h>
#undef _HUGE
double_t _HUGE = { 0x00000, 0x00000, 0x7ff, 0x0 };
double_s _HUGE = { 0x00000, 0x00000, 0x7ff, 0x0 };

View file

@ -21,12 +21,12 @@ long double modfl(long double __x, long double *__i)
union
{
long double* __x;
long_double_t* x;
long_double_s* x;
} x;
union
{
long double* __i;
long_double_t* iptr;
long_double_s* iptr;
} iptr;
int j0;