Identifier '__value' changed everywhere to '__val' to avoid clashes with Microsoft's 'managed C++' keyword

svn path=/trunk/; revision=19492
This commit is contained in:
Steven Edwards 2005-11-23 17:53:08 +00:00
parent a98cfa1b66
commit 3b374afaa1
6 changed files with 28 additions and 26 deletions

View file

@ -13,7 +13,9 @@
#define _M_ _KNJ_M /* Non-puntuation in Kana-set */ #define _M_ _KNJ_M /* Non-puntuation in Kana-set */
#define _P_ _KNJ_P /* Punctuation of Kana-set */ #define _P_ _KNJ_P /* Punctuation of Kana-set */
#define _12 (_1_|__2) #define _12 (_1_|__2)
#ifndef _M2
#define _M2 (_M_|__2) #define _M2 (_M_|__2)
#endif
#define _P2 (_P_|__2) #define _P2 (_P_|__2)

View file

@ -8,14 +8,14 @@ double atan2 (double __y, double __x);
*/ */
double atan2 (double __y, double __x) double atan2 (double __y, double __x)
{ {
register double __value; register double __val;
#ifdef __GNUC__ #ifdef __GNUC__
__asm __volatile__ __asm __volatile__
("fpatan\n\t" ("fpatan\n\t"
"fld %%st(0)" "fld %%st(0)"
: "=t" (__value) : "0" (__x), "u" (__y)); : "=t" (__val) : "0" (__x), "u" (__y));
#else #else
__value = linkme_atan2(__x, __y); __val = linkme_atan2(__x, __y);
#endif /*__GNUC__*/ #endif /*__GNUC__*/
return __value; return __val;
} }

View file

@ -24,16 +24,16 @@ double fmod (double __x, double __y);
double fmod (double __x, double __y) double fmod (double __x, double __y)
{ {
register double __value; register double __val;
#ifdef __GNUC__ #ifdef __GNUC__
__asm __volatile__ __asm __volatile__
("1: fprem\n\t" ("1: fprem\n\t"
"fstsw %%ax\n\t" "fstsw %%ax\n\t"
"sahf\n\t" "sahf\n\t"
"jp 1b" "jp 1b"
: "=t" (__value) : "0" (__x), "u" (__y) : "ax", "cc"); : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc");
#else #else
__value = linkme_fmod(__x, __y); __val = linkme_fmod(__x, __y);
#endif /*__GNUC__*/ #endif /*__GNUC__*/
return __value; return __val;
} }

View file

@ -24,13 +24,13 @@ double ldexp (double __x, int __y);
double ldexp (double __x, int __y) double ldexp (double __x, int __y)
{ {
register double __value; register double __val;
#ifdef __GNUC__ #ifdef __GNUC__
__asm __volatile__ __asm __volatile__
("fscale" ("fscale"
: "=t" (__value) : "0" (__x), "u" ((double) __y)); : "=t" (__val) : "0" (__x), "u" ((double) __y));
#else #else
__value = linkme_ldexp(__x, __y); __val = linkme_ldexp(__x, __y);
#endif /*__GNUC__*/ #endif /*__GNUC__*/
return __value; return __val;
} }

View file

@ -24,15 +24,15 @@ double log10 (double __x);
double log10 (double __x) double log10 (double __x)
{ {
register double __value; register double __val;
#ifdef __GNUC__ #ifdef __GNUC__
__asm __volatile__ __asm __volatile__
("fldlg2\n\t" ("fldlg2\n\t"
"fxch\n\t" "fxch\n\t"
"fyl2x" "fyl2x"
: "=t" (__value) : "0" (__x)); : "=t" (__val) : "0" (__x));
#else #else
__value = linkme_log10(__x); __val = linkme_log10(__x);
#endif /*__GNUC__*/ #endif /*__GNUC__*/
return __value; return __val;
} }

View file

@ -26,18 +26,18 @@ double __log2 (double __x);
double __log2 (double __x) double __log2 (double __x)
{ {
register double __value; register double __val;
#ifdef __GNUC__ #ifdef __GNUC__
__asm __volatile__ __asm __volatile__
("fld1\n\t" ("fld1\n\t"
"fxch\n\t" "fxch\n\t"
"fyl2x" "fyl2x"
: "=t" (__value) : "0" (__x)); : "=t" (__val) : "0" (__x));
#else #else
//__value = linkme_log2(__x); //__value = linkme_log2(__x);
__value = 0; __val = 0;
#endif /*__GNUC__*/ #endif /*__GNUC__*/
return __value; return __val;
} }
/* /*
@ -45,7 +45,7 @@ double __log2 (double __x)
*/ */
double pow (double __x, double __y) double pow (double __x, double __y)
{ {
register double __value; register double __val;
#ifdef __GNUC__ #ifdef __GNUC__
register double __exponent; register double __exponent;
long __p = (long) __y; long __p = (long) __y;
@ -80,15 +80,15 @@ double pow (double __x, double __y)
"fxch\n\t" "fxch\n\t"
"fsub %%st(1) # fract(y * log2(x))\n\t" "fsub %%st(1) # fract(y * log2(x))\n\t"
"f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t"
: "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); : "=t" (__val), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y));
__value += 1.0; __val += 1.0;
__asm __volatile__ __asm __volatile__
("fscale" ("fscale"
: "=t" (__value) : "0" (__value), "u" (__exponent)); : "=t" (__val) : "0" (__val), "u" (__exponent));
#else #else
__value = linkme_pow(__x, __y); __val = linkme_pow(__x, __y);
#endif /*__GNUC__*/ #endif /*__GNUC__*/
return __value; return __val;
} }
long double powl (long double __x,long double __y) long double powl (long double __x,long double __y)