diff options
author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
---|---|---|
committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
commit | 5f00496ef2e39b976b062f196ff01a99fd4864a4 (patch) | |
tree | 20be9cbc8f4b7ed3e616ce23552728083801e846 /usr/src/head/ieeefp.h | |
parent | af59b1a40df03681c1c8129aea7b1f5f52f2bcea (diff) | |
parent | 86bb58aec7165f8a0303564575c65e5a2ad58bf1 (diff) | |
download | illumos-joyent-release-20140821.tar.gz |
[illumos-gate merge]20140821release-20140821
commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86
Manifests:
usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
usr/src/pkg/manifests/SUNWparted.mf (torch headers)
usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
usr/src/pkg/manifests/system-storage-parted.mf
Diffstat (limited to 'usr/src/head/ieeefp.h')
-rw-r--r-- | usr/src/head/ieeefp.h | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/usr/src/head/ieeefp.h b/usr/src/head/ieeefp.h index ab582df519..0c19be3233 100644 --- a/usr/src/head/ieeefp.h +++ b/usr/src/head/ieeefp.h @@ -20,6 +20,8 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,8 +33,6 @@ #ifndef _IEEEFP_H #define _IEEEFP_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -69,13 +69,9 @@ typedef enum fpclass_t { FP_PNORM = 9 /* positive normalized non-zero */ } fpclass_t; -#if defined(__STDC__) extern fpclass_t fpclass(double); /* get class of double value */ extern int finite(double); extern int unordered(double, double); -#else -extern fpclass_t fpclass(); /* get class of double value */ -#endif /* * ROUNDING CONTROL ****************************************** @@ -114,16 +110,9 @@ typedef enum fp_rnd { #endif -#if defined(__STDC__) extern fp_rnd fpsetround(fp_rnd); /* set rounding mode, return previous */ extern fp_rnd fpgetround(void); /* return current rounding mode */ -#else -extern fp_rnd fpsetround(); /* set rounding mode, return previous */ -extern fp_rnd fpgetround(); /* return current rounding mode */ - -#endif - /* * EXCEPTION CONTROL ***************************************** * @@ -182,34 +171,18 @@ extern fp_rnd fpgetround(); /* return current rounding mode */ #endif -#if defined(__STDC__) extern fp_except fpgetmask(void); /* current exception mask */ extern fp_except fpsetmask(fp_except); /* set mask, return previous */ extern fp_except fpgetsticky(void); /* return logged exceptions */ extern fp_except fpsetsticky(fp_except); /* change logged exceptions */ -#else -extern fp_except fpgetmask(); /* current exception mask */ -extern fp_except fpsetmask(); /* set mask, return previous */ -extern fp_except fpgetsticky(); /* return logged exceptions */ -extern fp_except fpsetsticky(); /* change logged exceptions */ - -#endif - /* * UTILITY MACROS ******************************************** */ -#if defined(__STDC__) extern int isnanf(float); extern int isnand(double); -#else -extern int isnand(); -#define isnanf(x) (((*(long *)&(x) & 0x7f800000L) == 0x7f800000L) && \ - ((*(long *)&(x) & 0x007fffffL) != 0x00000000L)) -#endif - #if defined(__i386) || defined(__amd64) /* |