From 2dc130a72eaf694fcf3112abf548c0c19ebd53d8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 24 Jun 1999 20:41:47 +0000 Subject: [PATCH] [multiple changes] 1999-06-24 Tom Tromey * java/lang/e_asin.c: Don't use __int32_t or __uint32_t. * java/lang/fdlibm.h (HUGE): Conditionally define. Fri May 28 22:20:03 1999 Anthony Green * java/lang/fdlibm.h: Don't use __uint32_t. Include mprec.h. * java/lang/e_log.c: Don't use __uint32_t. From-SVN: r27733 --- libjava/ChangeLog | 5 +++++ libjava/java/lang/e_asin.c | 4 ++-- libjava/java/lang/fdlibm.h | 27 +++++++++++++-------------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index faa2bdb89a5..98b50af0c73 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +1999-06-24 Tom Tromey + + * java/lang/e_asin.c: Don't use __int32_t or __uint32_t. + * java/lang/fdlibm.h (HUGE): Conditionally define. + Fri May 28 22:20:03 1999 Anthony Green * java/lang/fdlibm.h: Don't use __uint32_t. Include mprec.h. diff --git a/libjava/java/lang/e_asin.c b/libjava/java/lang/e_asin.c index 559f2884a26..6b131e65a26 100644 --- a/libjava/java/lang/e_asin.c +++ b/libjava/java/lang/e_asin.c @@ -76,11 +76,11 @@ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ #endif { double t,w,p,q,c,r,s; - __int32_t hx,ix; + int32_t hx,ix; GET_HIGH_WORD(hx,x); ix = hx&0x7fffffff; if(ix>= 0x3ff00000) { /* |x|>= 1 */ - __uint32_t lx; + uint32_t lx; GET_LOW_WORD(lx,x); if(((ix-0x3ff00000)|lx)==0) /* asin(1)=+-pi/2 with inexact */ diff --git a/libjava/java/lang/fdlibm.h b/libjava/java/lang/fdlibm.h index 3f72070cf81..00d43e55238 100644 --- a/libjava/java/lang/fdlibm.h +++ b/libjava/java/lang/fdlibm.h @@ -22,6 +22,8 @@ extern "C" { /* CYGNUS LOCAL: Include files. */ #include "ieeefp.h" +#include "mprec.h" + /* CYGNUS LOCAL: Default to XOPEN_MODE. */ #define _XOPEN_MODE @@ -31,7 +33,9 @@ extern "C" { #define __P(p) () #endif +#ifndef HUGE #define HUGE ((float)3.40282346638528860e+38) +#endif /* * set X_TLOSS = pi*2**52, which is possibly defined in @@ -42,11 +46,6 @@ extern "C" { /* These typedefs are true for the targets running Java. */ -#ifndef HAVE_INT32_DEFINED -typedef int __int32_t; -typedef unsigned int __uint32_t; -#endif - #define _IEEE_LIBM /* @@ -135,7 +134,7 @@ extern double __ieee754_y1 __P((double)); extern double __ieee754_jn __P((int,double)); extern double __ieee754_yn __P((int,double)); extern double __ieee754_remainder __P((double,double)); -extern __int32_t __ieee754_rem_pio2 __P((double,double*)); +extern int32_t __ieee754_rem_pio2 __P((double,double*)); #ifdef _SCALB_INT extern double __ieee754_scalb __P((double,int)); #else @@ -147,7 +146,7 @@ extern double __kernel_standard __P((double,double,int)); extern double __kernel_sin __P((double,double,int)); extern double __kernel_cos __P((double,double)); extern double __kernel_tan __P((double,double,int)); -extern int __kernel_rem_pio2 __P((double*,double*,int,int,int,const __int32_t*)); +extern int __kernel_rem_pio2 __P((double*,double*,int,int,int,const int32_t*)); /* Undocumented float functions. */ extern float logbf __P((float)); @@ -191,7 +190,7 @@ extern float __ieee754_y1f __P((float)); extern float __ieee754_jnf __P((int,float)); extern float __ieee754_ynf __P((int,float)); extern float __ieee754_remainderf __P((float,float)); -extern __int32_t __ieee754_rem_pio2f __P((float,float*)); +extern int32_t __ieee754_rem_pio2f __P((float,float*)); #ifdef _SCALB_INT extern float __ieee754_scalbf __P((float,int)); #else @@ -202,7 +201,7 @@ extern float __ieee754_scalbf __P((float,float)); extern float __kernel_sinf __P((float,float,int)); extern float __kernel_cosf __P((float,float)); extern float __kernel_tanf __P((float,float,int)); -extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const __int32_t*)); +extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const int32_t*)); /* The original code used statements like n0 = ((*(int*)&one)>>29)^1; * index of high word * @@ -231,8 +230,8 @@ typedef union double value; struct { - __uint32_t msw; - __uint32_t lsw; + uint32_t msw; + uint32_t lsw; } parts; } ieee_double_shape_type; @@ -245,8 +244,8 @@ typedef union double value; struct { - __uint32_t lsw; - __uint32_t msw; + uint32_t lsw; + uint32_t msw; } parts; } ieee_double_shape_type; @@ -316,7 +315,7 @@ do { \ typedef union { float value; - __uint32_t word; + uint32_t word; } ieee_float_shape_type; /* Get a 32 bit int from a float. */ -- 2.30.2