Modified: trunk/reactos/lib/crt/include/internal/mbstring.h
Modified: trunk/reactos/lib/crt/math/atan2.c
Modified: trunk/reactos/lib/crt/math/fmod.c
Modified: trunk/reactos/lib/crt/math/ldexp.c
Modified: trunk/reactos/lib/crt/math/log10.c
Modified: trunk/reactos/lib/crt/math/pow.c
--- trunk/reactos/lib/crt/include/internal/mbstring.h 2005-11-23 17:31:28 UTC (rev 19491)
+++ trunk/reactos/lib/crt/include/internal/mbstring.h 2005-11-23 17:53:08 UTC (rev 19492)
@@ -13,7 +13,9 @@
#define _M_ _KNJ_M /* Non-puntuation in Kana-set */
#define _P_ _KNJ_P /* Punctuation of Kana-set */
#define _12 (_1_|__2)
+#ifndef _M2
#define _M2 (_M_|__2)
+#endif
#define _P2 (_P_|__2)
--- trunk/reactos/lib/crt/math/atan2.c 2005-11-23 17:31:28 UTC (rev 19491)
+++ trunk/reactos/lib/crt/math/atan2.c 2005-11-23 17:53:08 UTC (rev 19492)
@@ -8,14 +8,14 @@
*/
double atan2 (double __y, double __x)
{
- register double __value;
+ register double __val;
#ifdef __GNUC__
__asm __volatile__
("fpatan\n\t"
"fld %%st(0)"
- : "=t" (__value) : "0" (__x), "u" (__y));
+ : "=t" (__val) : "0" (__x), "u" (__y));
#else
- __value = linkme_atan2(__x, __y);
+ __val = linkme_atan2(__x, __y);
#endif /*__GNUC__*/
- return __value;
+ return __val;
}
--- trunk/reactos/lib/crt/math/fmod.c 2005-11-23 17:31:28 UTC (rev 19491)
+++ trunk/reactos/lib/crt/math/fmod.c 2005-11-23 17:53:08 UTC (rev 19492)
@@ -24,16 +24,16 @@
double fmod (double __x, double __y)
{
- register double __value;
+ register double __val;
#ifdef __GNUC__
__asm __volatile__
("1: fprem\n\t"
"fstsw %%ax\n\t"
"sahf\n\t"
"jp 1b"
- : "=t" (__value) : "0" (__x), "u" (__y) : "ax", "cc");
+ : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc");
#else
- __value = linkme_fmod(__x, __y);
+ __val = linkme_fmod(__x, __y);
#endif /*__GNUC__*/
- return __value;
+ return __val;
}
--- trunk/reactos/lib/crt/math/ldexp.c 2005-11-23 17:31:28 UTC (rev 19491)
+++ trunk/reactos/lib/crt/math/ldexp.c 2005-11-23 17:53:08 UTC (rev 19492)
@@ -24,13 +24,13 @@
double ldexp (double __x, int __y)
{
- register double __value;
+ register double __val;
#ifdef __GNUC__
__asm __volatile__
("fscale"
- : "=t" (__value) : "0" (__x), "u" ((double) __y));
+ : "=t" (__val) : "0" (__x), "u" ((double) __y));
#else
- __value = linkme_ldexp(__x, __y);
+ __val = linkme_ldexp(__x, __y);
#endif /*__GNUC__*/
- return __value;
+ return __val;
}
--- trunk/reactos/lib/crt/math/log10.c 2005-11-23 17:31:28 UTC (rev 19491)
+++ trunk/reactos/lib/crt/math/log10.c 2005-11-23 17:53:08 UTC (rev 19492)
@@ -24,15 +24,15 @@
double log10 (double __x)
{
- register double __value;
+ register double __val;
#ifdef __GNUC__
__asm __volatile__
("fldlg2\n\t"
"fxch\n\t"
"fyl2x"
- : "=t" (__value) : "0" (__x));
+ : "=t" (__val) : "0" (__x));
#else
- __value = linkme_log10(__x);
+ __val = linkme_log10(__x);
#endif /*__GNUC__*/
- return __value;
+ return __val;
}
--- trunk/reactos/lib/crt/math/pow.c 2005-11-23 17:31:28 UTC (rev 19491)
+++ trunk/reactos/lib/crt/math/pow.c 2005-11-23 17:53:08 UTC (rev 19492)
@@ -26,18 +26,18 @@
double __log2 (double __x)
{
- register double __value;
+ register double __val;
#ifdef __GNUC__
__asm __volatile__
("fld1\n\t"
"fxch\n\t"
"fyl2x"
- : "=t" (__value) : "0" (__x));
+ : "=t" (__val) : "0" (__x));
#else
//__value = linkme_log2(__x);
- __value = 0;
+ __val = 0;
#endif /*__GNUC__*/
- return __value;
+ return __val;
}
/*
@@ -45,7 +45,7 @@
*/
double pow (double __x, double __y)
{
- register double __value;
+ register double __val;
#ifdef __GNUC__
register double __exponent;
long __p = (long) __y;
@@ -80,15 +80,15 @@
"fxch\n\t"
"fsub %%st(1) # fract(y * log2(x))\n\t"
"f2xm1 # 2^(fract(y * log2(x))) - 1\n\t"
- : "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y));
- __value += 1.0;
+ : "=t" (__val), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y));
+ __val += 1.0;
__asm __volatile__
("fscale"
- : "=t" (__value) : "0" (__value), "u" (__exponent));
+ : "=t" (__val) : "0" (__val), "u" (__exponent));
#else
- __value = linkme_pow(__x, __y);
+ __val = linkme_pow(__x, __y);
#endif /*__GNUC__*/
- return __value;
+ return __val;
}
long double powl (long double __x,long double __y)