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

26 Mar 2010

Author: tkreuzer
Date: Sat Mar 27 00:41:53 2010
New Revision: 46478
URL: http://svn.reactos.org/svn/reactos?rev=46478&view=rev
Log:
[CRT]
- define _CRTBLD
- rename float_t/double_t/long_double_t to float_s/double_s/long_double_s to avoid name conflicts
Modified:
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/xcptfil.c
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/chgsign.c
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/copysign.c
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/fpclass.c
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/isnan.c
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/scalb.c
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/ieee.h
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/frexp.c
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/huge_val.c
    branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/modf.c
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================

--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -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>
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/xcptfil.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/xcptfil.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/xcptfil.c [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -94,7 +94,7 @@
     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;
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/chgsign.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/chgsign.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/chgsign.c [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -20,7 +20,7 @@
    union
    {
        double* __x;
-	    double_t *x;
+	    double_s *x;
    } u;
    u.__x = &__x;
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/copysign.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/copysign.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/copysign.c [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -19,12 +19,12 @@
   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;
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/fpclass.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -50,7 +50,7 @@
    union
    {
    	double*	  __d;
-		double_t*   d;
+		double_s*   d;
    } d;
    d.__d = &__d;
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/isnan.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -28,7 +28,7 @@
    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 @@
    union
    {
    	long double*   __x;
-		long_double_t*   x;
+		long_double_s*   x;
    } x;
    x.__x = &__x;
@@ -59,7 +59,7 @@
    union
    {
    	double*   __x;
-		double_t*   x;
+		double_s*   x;
    } x;
x.__x = &__x;
@@ -81,7 +81,7 @@
    union
    {
    	long double*   __x;
-                long_double_t*   x;
+                long_double_s*   x;
    } x;
x.__x = &__x;
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/scalb.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/scalb.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/float/scalb.c [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -19,7 +19,7 @@
    union
    {
    	double*   __x;
-                double_t*   x;
+                double_s*   x;
    } x;
x.__x = &__x;
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/ieee.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/ieee.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/ieee.h [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -5,14 +5,14 @@
     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 @@
     unsigned int exponent:15;
     unsigned int sign:1;
     unsigned int empty:16;
-} long_double_t;
+} long_double_s;
#endif
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -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>
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/frexp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/frexp.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/frexp.c [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -11,7 +11,7 @@
    union
    {
    	double*   __x;
-		double_t*   x;
+		double_s*   x;
    } x;
x.__x = &__x;
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/huge_val.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/huge_val.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/huge_val.c [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -3,4 +3,4 @@
 #include <internal/ieee.h>
#undef _HUGE
-double_t _HUGE = { 0x00000, 0x00000, 0x7ff, 0x0 };
+double_s _HUGE = { 0x00000, 0x00000, 0x7ff, 0x0 };
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/modf.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd...
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/modf.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/math/modf.c [iso-8859-1] Sat Mar 27 00:41:53 2010
@@ -21,12 +21,12 @@
    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;

    