mirror of
https://github.com/reactos/reactos.git
synced 2025-07-23 05:13:39 +00:00
[CRT]
- define _CRTBLD - rename float_t/double_t/long_double_t to float_s/double_s/long_double_s to avoid name conflicts svn path=/branches/ros-amd64-bringup/; revision=46478
This commit is contained in:
parent
f8b4d53d3c
commit
c57a8df416
12 changed files with 19 additions and 17 deletions
|
@ -25,6 +25,7 @@
|
||||||
<define name="_MSVCRT_LIB_" />
|
<define name="_MSVCRT_LIB_" />
|
||||||
<define name="_MSVCRT_" />
|
<define name="_MSVCRT_" />
|
||||||
<define name="_MT" />
|
<define name="_MT" />
|
||||||
|
<define name="_CRTBLD" />
|
||||||
<directory name="conio">
|
<directory name="conio">
|
||||||
<file>cgets.c</file>
|
<file>cgets.c</file>
|
||||||
<file>cprintf.c</file>
|
<file>cprintf.c</file>
|
||||||
|
|
|
@ -94,7 +94,7 @@ _XcptFilter(DWORD ExceptionCode,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
|
int CDECL __CppXcptFilter(unsigned long ex, PEXCEPTION_POINTERS ptr)
|
||||||
{
|
{
|
||||||
/* only filter c++ exceptions */
|
/* only filter c++ exceptions */
|
||||||
if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH;
|
if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH;
|
||||||
|
|
|
@ -20,7 +20,7 @@ double _chgsign( double __x )
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
double* __x;
|
double* __x;
|
||||||
double_t *x;
|
double_s *x;
|
||||||
} u;
|
} u;
|
||||||
u.__x = &__x;
|
u.__x = &__x;
|
||||||
|
|
||||||
|
|
|
@ -19,12 +19,12 @@ double _copysign (double __d, double __s)
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
double* __d;
|
double* __d;
|
||||||
double_t* d;
|
double_s* d;
|
||||||
} d;
|
} d;
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
double* __s;
|
double* __s;
|
||||||
double_t* s;
|
double_s* s;
|
||||||
} s;
|
} s;
|
||||||
d.__d = &__d;
|
d.__d = &__d;
|
||||||
s.__s = &__s;
|
s.__s = &__s;
|
||||||
|
|
|
@ -50,7 +50,7 @@ fpclass_t _fpclass(double __d)
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
double* __d;
|
double* __d;
|
||||||
double_t* d;
|
double_s* d;
|
||||||
} d;
|
} d;
|
||||||
d.__d = &__d;
|
d.__d = &__d;
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ int _isnan(double __x)
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
double* __x;
|
double* __x;
|
||||||
double_t* x;
|
double_s* x;
|
||||||
} x;
|
} x;
|
||||||
x.__x = &__x;
|
x.__x = &__x;
|
||||||
return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 ));
|
return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 ));
|
||||||
|
@ -41,7 +41,7 @@ int _isnanl(long double __x)
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
long double* __x;
|
long double* __x;
|
||||||
long_double_t* x;
|
long_double_s* x;
|
||||||
} x;
|
} x;
|
||||||
x.__x = &__x;
|
x.__x = &__x;
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ int _isinf(double __x)
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
double* __x;
|
double* __x;
|
||||||
double_t* x;
|
double_s* x;
|
||||||
} x;
|
} x;
|
||||||
|
|
||||||
x.__x = &__x;
|
x.__x = &__x;
|
||||||
|
@ -81,7 +81,7 @@ int _isinfl(long double __x)
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
long double* __x;
|
long double* __x;
|
||||||
long_double_t* x;
|
long_double_s* x;
|
||||||
} x;
|
} x;
|
||||||
|
|
||||||
x.__x = &__x;
|
x.__x = &__x;
|
||||||
|
|
|
@ -19,7 +19,7 @@ double _scalb( double __x, long e )
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
double* __x;
|
double* __x;
|
||||||
double_t* x;
|
double_s* x;
|
||||||
} x;
|
} x;
|
||||||
|
|
||||||
x.__x = &__x;
|
x.__x = &__x;
|
||||||
|
|
|
@ -5,14 +5,14 @@ typedef struct {
|
||||||
unsigned int mantissa:23;
|
unsigned int mantissa:23;
|
||||||
unsigned int exponent:8;
|
unsigned int exponent:8;
|
||||||
unsigned int sign:1;
|
unsigned int sign:1;
|
||||||
} float_t;
|
} float_s;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
unsigned int mantissal:32;
|
unsigned int mantissal:32;
|
||||||
unsigned int mantissah:20;
|
unsigned int mantissah:20;
|
||||||
unsigned int exponent:11;
|
unsigned int exponent:11;
|
||||||
unsigned int sign:1;
|
unsigned int sign:1;
|
||||||
} double_t;
|
} double_s;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
unsigned int mantissal:32;
|
unsigned int mantissal:32;
|
||||||
|
@ -20,6 +20,6 @@ typedef struct {
|
||||||
unsigned int exponent:15;
|
unsigned int exponent:15;
|
||||||
unsigned int sign:1;
|
unsigned int sign:1;
|
||||||
unsigned int empty:16;
|
unsigned int empty:16;
|
||||||
} long_double_t;
|
} long_double_s;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
<define name="_NTSYSTEM_" />
|
<define name="_NTSYSTEM_" />
|
||||||
<define name="_NTDLLBUILD_" />
|
<define name="_NTDLLBUILD_" />
|
||||||
<define name="_LIBCNT_" />
|
<define name="_LIBCNT_" />
|
||||||
|
<define name="_CRTBLD" />
|
||||||
<if property="ARCH" value="i386">
|
<if property="ARCH" value="i386">
|
||||||
<define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define>
|
<define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define>
|
||||||
</if>
|
</if>
|
||||||
|
|
|
@ -11,7 +11,7 @@ frexp(double __x, int *exptr)
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
double* __x;
|
double* __x;
|
||||||
double_t* x;
|
double_s* x;
|
||||||
} x;
|
} x;
|
||||||
|
|
||||||
x.__x = &__x;
|
x.__x = &__x;
|
||||||
|
|
|
@ -3,4 +3,4 @@
|
||||||
#include <internal/ieee.h>
|
#include <internal/ieee.h>
|
||||||
|
|
||||||
#undef _HUGE
|
#undef _HUGE
|
||||||
double_t _HUGE = { 0x00000, 0x00000, 0x7ff, 0x0 };
|
double_s _HUGE = { 0x00000, 0x00000, 0x7ff, 0x0 };
|
||||||
|
|
|
@ -21,12 +21,12 @@ long double modfl(long double __x, long double *__i)
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
long double* __x;
|
long double* __x;
|
||||||
long_double_t* x;
|
long_double_s* x;
|
||||||
} x;
|
} x;
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
long double* __i;
|
long double* __i;
|
||||||
long_double_t* iptr;
|
long_double_s* iptr;
|
||||||
} iptr;
|
} iptr;
|
||||||
|
|
||||||
int j0;
|
int j0;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue