===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/math.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/include/math.h	2015/07/19 17:41:49	1.34
--- src/include/math.h	2016/03/17 20:55:35	1.35
***************
*** 1,4 ****
! /*	$OpenBSD: math.h,v 1.34 2015/07/19 17:41:49 martynas Exp $	*/
  /*
   * ====================================================
   * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: math.h,v 1.35 2016/03/17 20:55:35 jca Exp $	*/
  /*
   * ====================================================
   * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
***************
*** 25,35 ****
   * ANSI/POSIX
   */
  extern char __infinity[];
! #if __GNUC_PREREQ__(3, 3) && !defined(__vax__)
  #define HUGE_VAL	__builtin_huge_val()
! #else /* __GNUC_PREREQ__(3, 3) && !__vax__ */
  #define HUGE_VAL	(*(double *)(void *)__infinity)
! #endif /* __GNUC_PREREQ__(3, 3) && !__vax__ */
  
  /*
   * C99
--- 25,35 ----
   * ANSI/POSIX
   */
  extern char __infinity[];
! #if __GNUC_PREREQ__(3, 3)
  #define HUGE_VAL	__builtin_huge_val()
! #else /* __GNUC_PREREQ__(3, 3) */
  #define HUGE_VAL	(*(double *)(void *)__infinity)
! #endif /* __GNUC_PREREQ__(3, 3) */
  
  /*
   * C99
***************
*** 38,62 ****
  typedef	__double_t	double_t;
  typedef	__float_t	float_t;
  
! #if __GNUC_PREREQ__(3, 3) && !defined(__vax__)
  #define	HUGE_VALF	__builtin_huge_valf()
  #define	HUGE_VALL	__builtin_huge_vall()
  #define	INFINITY	__builtin_inff()
  #define	NAN		__builtin_nanf("")
! #else /* __GNUC_PREREQ__(3, 3) && !__vax__ */
! #ifdef __vax__
! extern char __infinityf[];
! #define	HUGE_VALF	(*(float *)(void *)__infinityf)
! #else /* __vax__ */
  #define	HUGE_VALF	((float)HUGE_VAL)
- #endif /* __vax__ */
  #define	HUGE_VALL	((long double)HUGE_VAL)
  #define	INFINITY	HUGE_VALF
- #ifndef __vax__
  extern char __nan[];
  #define	NAN		(*(float *)(void *)__nan)
! #endif /* !__vax__ */
! #endif /* __GNUC_PREREQ__(3, 3) && !__vax__ */
  
  #define	FP_INFINITE	0x01
  #define	FP_NAN		0x02
--- 38,55 ----
  typedef	__double_t	double_t;
  typedef	__float_t	float_t;
  
! #if __GNUC_PREREQ__(3, 3)
  #define	HUGE_VALF	__builtin_huge_valf()
  #define	HUGE_VALL	__builtin_huge_vall()
  #define	INFINITY	__builtin_inff()
  #define	NAN		__builtin_nanf("")
! #else /* __GNUC_PREREQ__(3, 3) */
  #define	HUGE_VALF	((float)HUGE_VAL)
  #define	HUGE_VALL	((long double)HUGE_VAL)
  #define	INFINITY	HUGE_VALF
  extern char __nan[];
  #define	NAN		(*(float *)(void *)__nan)
! #endif /* __GNUC_PREREQ__(3, 3) */
  
  #define	FP_INFINITE	0x01
  #define	FP_NAN		0x02
***************
*** 148,158 ****
  #define	M_SQRT2		((double)1.41421356237309504880) /* 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)
- #endif /* __vax__ */
  
  extern int signgam;
  #endif /* __BSD_VISIBLE || __XPG_VISIBLE */
--- 141,147 ----
***************
*** 492,501 ****
  int __signbit(double);
  int __signbitf(float);
  int __signbitl(long double);
- 
- #if __BSD_VISIBLE && defined(__vax__)
- double infnan(int);
- #endif /* __BSD_VISIBLE && defined(__vax__) */
  __END_DECLS
  
  #endif /* !_MATH_H_ */
--- 481,486 ----