[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

diff --git a/reactos/lib/sdk/crt/crt.rbuild b/reactos/lib/sdk/crt/crt.rbuild
index 7990998..5c06273 100644 (file)
--- a/reactos/lib/sdk/crt/crt.rbuild
+++ b/reactos/lib/sdk/crt/crt.rbuild
@@ -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>

diff --git a/reactos/lib/sdk/crt/except/xcptfil.c b/reactos/lib/sdk/crt/except/xcptfil.c
index e617af5..e294e12 100644 (file)
--- 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 2cc440f..a9d9a1d 100644 (file)
--- 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 992f82c..5ebdeb1 100644 (file)
--- 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 665379c..82d3d4e 100644 (file)
--- 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 1269df1..fb328d3 100644 (file)
--- 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 ac521d0..f147a6e 100644 (file)
--- 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 f397723..bcc693d 100644 (file)
--- 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 156f4b9..bb500d6 100644 (file)
--- a/reactos/lib/sdk/crt/libcntpr.rbuild
+++ b/reactos/lib/sdk/crt/libcntpr.rbuild
@@ -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>

diff --git a/reactos/lib/sdk/crt/math/frexp.c b/reactos/lib/sdk/crt/math/frexp.c
index 913cc5c..fa8de1e 100644 (file)
--- 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 66b5716..4bab35c 100644 (file)
--- a/reactos/lib/sdk/crt/math/huge_val.c
+++ b/reactos/lib/sdk/crt/math/huge_val.c
@@ -3,4 +3,4 @@
 #include <internal/ieee.h>
 
 #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 72b937c..8212070 100644 (file)
--- 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;