Browse Source

Remove #ifdef __vax__ bits

ok deraadt@ tb@ (who had the same diff)
OPENBSD_6_0
jca 8 years ago
parent
commit
24d299a1da
1 changed files with 7 additions and 22 deletions
  1. +7
    -22
      src/include/math.h

+ 7
- 22
src/include/math.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: math.h,v 1.34 2015/07/19 17:41:49 martynas Exp $ */
/* $OpenBSD: math.h,v 1.35 2016/03/17 20:55:35 jca Exp $ */
/* /*
* ==================================================== * ====================================================
* Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@ -25,11 +25,11 @@ __BEGIN_DECLS
* ANSI/POSIX * ANSI/POSIX
*/ */
extern char __infinity[]; extern char __infinity[];
#if __GNUC_PREREQ__(3, 3) && !defined(__vax__)
#if __GNUC_PREREQ__(3, 3)
#define HUGE_VAL __builtin_huge_val() #define HUGE_VAL __builtin_huge_val()
#else /* __GNUC_PREREQ__(3, 3) && !__vax__ */
#else /* __GNUC_PREREQ__(3, 3) */
#define HUGE_VAL (*(double *)(void *)__infinity) #define HUGE_VAL (*(double *)(void *)__infinity)
#endif /* __GNUC_PREREQ__(3, 3) && !__vax__ */
#endif /* __GNUC_PREREQ__(3, 3) */
/* /*
* C99 * C99
@ -38,25 +38,18 @@ extern char __infinity[];
typedef __double_t double_t; typedef __double_t double_t;
typedef __float_t float_t; typedef __float_t float_t;
#if __GNUC_PREREQ__(3, 3) && !defined(__vax__)
#if __GNUC_PREREQ__(3, 3)
#define HUGE_VALF __builtin_huge_valf() #define HUGE_VALF __builtin_huge_valf()
#define HUGE_VALL __builtin_huge_vall() #define HUGE_VALL __builtin_huge_vall()
#define INFINITY __builtin_inff() #define INFINITY __builtin_inff()
#define NAN __builtin_nanf("") #define NAN __builtin_nanf("")
#else /* __GNUC_PREREQ__(3, 3) && !__vax__ */
#ifdef __vax__
extern char __infinityf[];
#define HUGE_VALF (*(float *)(void *)__infinityf)
#else /* __vax__ */
#else /* __GNUC_PREREQ__(3, 3) */
#define HUGE_VALF ((float)HUGE_VAL) #define HUGE_VALF ((float)HUGE_VAL)
#endif /* __vax__ */
#define HUGE_VALL ((long double)HUGE_VAL) #define HUGE_VALL ((long double)HUGE_VAL)
#define INFINITY HUGE_VALF #define INFINITY HUGE_VALF
#ifndef __vax__
extern char __nan[]; extern char __nan[];
#define NAN (*(float *)(void *)__nan) #define NAN (*(float *)(void *)__nan)
#endif /* !__vax__ */
#endif /* __GNUC_PREREQ__(3, 3) && !__vax__ */
#endif /* __GNUC_PREREQ__(3, 3) */
#define FP_INFINITE 0x01 #define FP_INFINITE 0x01
#define FP_NAN 0x02 #define FP_NAN 0x02
@ -148,11 +141,7 @@ extern char __nan[];
#define M_SQRT2 ((double)1.41421356237309504880) /* sqrt(2) */ #define M_SQRT2 ((double)1.41421356237309504880) /* sqrt(2) */
#define M_SQRT1_2 ((double)0.70710678118654752440) /* 1/sqrt(2) */ #define M_SQRT1_2 ((double)0.70710678118654752440) /* 1/sqrt(2) */
#ifdef __vax__
#define MAXFLOAT ((float)1.70141173319264430e+38)
#else
#define MAXFLOAT ((float)3.40282346638528860e+38) #define MAXFLOAT ((float)3.40282346638528860e+38)
#endif /* __vax__ */
extern int signgam; extern int signgam;
#endif /* __BSD_VISIBLE || __XPG_VISIBLE */ #endif /* __BSD_VISIBLE || __XPG_VISIBLE */
@ -492,10 +481,6 @@ int __isnormall(long double);
int __signbit(double); int __signbit(double);
int __signbitf(float); int __signbitf(float);
int __signbitl(long double); int __signbitl(long double);
#if __BSD_VISIBLE && defined(__vax__)
double infnan(int);
#endif /* __BSD_VISIBLE && defined(__vax__) */
__END_DECLS __END_DECLS
#endif /* !_MATH_H_ */ #endif /* !_MATH_H_ */

Loading…
Cancel
Save