From c57a8df416b4266843a6601f6a7378dfd6526e6f Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Fri, 26 Mar 2010 23:41:53 +0000 Subject: [PATCH] [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 --- reactos/lib/sdk/crt/crt.rbuild | 1 + reactos/lib/sdk/crt/except/xcptfil.c | 2 +- reactos/lib/sdk/crt/float/chgsign.c | 2 +- reactos/lib/sdk/crt/float/copysign.c | 4 ++-- reactos/lib/sdk/crt/float/fpclass.c | 2 +- reactos/lib/sdk/crt/float/isnan.c | 8 ++++---- reactos/lib/sdk/crt/float/scalb.c | 2 +- reactos/lib/sdk/crt/include/internal/ieee.h | 6 +++--- reactos/lib/sdk/crt/libcntpr.rbuild | 1 + reactos/lib/sdk/crt/math/frexp.c | 2 +- reactos/lib/sdk/crt/math/huge_val.c | 2 +- reactos/lib/sdk/crt/math/modf.c | 4 ++-- 12 files changed, 19 insertions(+), 17 deletions(-) diff --git a/reactos/lib/sdk/crt/crt.rbuild b/reactos/lib/sdk/crt/crt.rbuild index 799099848ea..5c06273be9d 100644 --- a/reactos/lib/sdk/crt/crt.rbuild +++ b/reactos/lib/sdk/crt/crt.rbuild @@ -25,6 +25,7 @@ + cgets.c cprintf.c diff --git a/reactos/lib/sdk/crt/except/xcptfil.c b/reactos/lib/sdk/crt/except/xcptfil.c index e617af5119e..e294e127a81 100644 --- a/reactos/lib/sdk/crt/except/xcptfil.c +++ b/reactos/lib/sdk/crt/except/xcptfil.c @@ -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; diff --git a/reactos/lib/sdk/crt/float/chgsign.c b/reactos/lib/sdk/crt/float/chgsign.c index 2cc440ff9de..a9d9a1d3aed 100644 --- a/reactos/lib/sdk/crt/float/chgsign.c +++ b/reactos/lib/sdk/crt/float/chgsign.c @@ -20,7 +20,7 @@ double _chgsign( double __x ) union { double* __x; - double_t *x; + double_s *x; } u; u.__x = &__x; diff --git a/reactos/lib/sdk/crt/float/copysign.c b/reactos/lib/sdk/crt/float/copysign.c index 992f82c3cea..5ebdeb1e854 100644 --- a/reactos/lib/sdk/crt/float/copysign.c +++ b/reactos/lib/sdk/crt/float/copysign.c @@ -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; diff --git a/reactos/lib/sdk/crt/float/fpclass.c b/reactos/lib/sdk/crt/float/fpclass.c index 665379c21bf..82d3d4edb83 100644 --- a/reactos/lib/sdk/crt/float/fpclass.c +++ b/reactos/lib/sdk/crt/float/fpclass.c @@ -50,7 +50,7 @@ fpclass_t _fpclass(double __d) union { double* __d; - double_t* d; + double_s* d; } d; d.__d = &__d; diff --git a/reactos/lib/sdk/crt/float/isnan.c b/reactos/lib/sdk/crt/float/isnan.c index 1269df14e7e..fb328d30d97 100644 --- a/reactos/lib/sdk/crt/float/isnan.c +++ b/reactos/lib/sdk/crt/float/isnan.c @@ -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; diff --git a/reactos/lib/sdk/crt/float/scalb.c b/reactos/lib/sdk/crt/float/scalb.c index ac521d0e127..f147a6e03cc 100644 --- a/reactos/lib/sdk/crt/float/scalb.c +++ b/reactos/lib/sdk/crt/float/scalb.c @@ -19,7 +19,7 @@ double _scalb( double __x, long e ) union { double* __x; - double_t* x; + double_s* x; } x; x.__x = &__x; diff --git a/reactos/lib/sdk/crt/include/internal/ieee.h b/reactos/lib/sdk/crt/include/internal/ieee.h index f397723feae..bcc693d94a6 100644 --- a/reactos/lib/sdk/crt/include/internal/ieee.h +++ b/reactos/lib/sdk/crt/include/internal/ieee.h @@ -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 diff --git a/reactos/lib/sdk/crt/libcntpr.rbuild b/reactos/lib/sdk/crt/libcntpr.rbuild index 156f4b9240d..bb500d681f1 100644 --- a/reactos/lib/sdk/crt/libcntpr.rbuild +++ b/reactos/lib/sdk/crt/libcntpr.rbuild @@ -7,6 +7,7 @@ + "extern __attribute__ ((dllexport))" diff --git a/reactos/lib/sdk/crt/math/frexp.c b/reactos/lib/sdk/crt/math/frexp.c index 913cc5c7271..fa8de1e01da 100644 --- a/reactos/lib/sdk/crt/math/frexp.c +++ b/reactos/lib/sdk/crt/math/frexp.c @@ -11,7 +11,7 @@ frexp(double __x, int *exptr) union { double* __x; - double_t* x; + double_s* x; } x; x.__x = &__x; diff --git a/reactos/lib/sdk/crt/math/huge_val.c b/reactos/lib/sdk/crt/math/huge_val.c index 66b5716bf80..4bab35cf60c 100644 --- a/reactos/lib/sdk/crt/math/huge_val.c +++ b/reactos/lib/sdk/crt/math/huge_val.c @@ -3,4 +3,4 @@ #include #undef _HUGE -double_t _HUGE = { 0x00000, 0x00000, 0x7ff, 0x0 }; +double_s _HUGE = { 0x00000, 0x00000, 0x7ff, 0x0 }; diff --git a/reactos/lib/sdk/crt/math/modf.c b/reactos/lib/sdk/crt/math/modf.c index 72b937c36d5..8212070e2c8 100644 --- a/reactos/lib/sdk/crt/math/modf.c +++ b/reactos/lib/sdk/crt/math/modf.c @@ -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;