Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Sep 2002 21:31:20 +0200 (CEST)
From:      Dan Lukes <dan@obluda.cz>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        dan@obluda.cz
Subject:   bin/42388: cleaning code from warnings in libm
Message-ID:  <200209031931.g83JVKGS006470@xkulesh.vol.cz>

next in thread | raw e-mail | index | archive | help

>Number:         42388
>Category:       bin
>Synopsis:       cleaning code from warnings in libm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 03 14:40:04 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Dan Lukes
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Obludarium
>Environment:
src/lib/msun/bsdsrc/b_exp.c,v 1.5 2002/03/26 11:59:29
src/lib/msun/bsdsrc/b_log.c,v 1.5 2002/03/26 11:59:29
src/lib/msun/bsdsrc/b_tgamma.c,v 1.5 2002/03/26 11:59:29
src/lib/msun/src/e_acos.c,v 1.8 2002/05/28 17:03:12
src/lib/msun/src/e_acosf.c,v 1.7 2002/05/28 17:03:12
src/lib/msun/src/e_acosh.c,v 1.7 2002/05/28 17:03:12
src/lib/msun/src/e_acoshf.c,v 1.7 2002/05/28 17:03:12
src/lib/msun/src/e_asin.c,v 1.9 2002/05/28 17:03:12
src/lib/msun/src/e_asinf.c,v 1.8 2002/05/28 17:03:12
src/lib/msun/src/e_atan2.c,v 1.8 2002/05/28 17:03:12
src/lib/msun/src/e_atan2f.c,v 1.6 2002/05/28 17:03:12
src/lib/msun/src/e_atanh.c,v 1.6 2002/05/28 17:03:12
src/lib/msun/src/e_atanhf.c,v 1.6 2002/05/28 17:03:12
src/lib/msun/src/e_cosh.c,v 1.7 2002/05/28 17:03:12
src/lib/msun/src/e_coshf.c,v 1.6 2002/05/28 17:03:12
src/lib/msun/src/e_exp.c,v 1.8 2002/05/28 17:03:12
src/lib/msun/src/e_expf.c,v 1.7 2002/05/28 17:03:12
src/lib/msun/src/e_fmod.c,v 1.7 2002/05/28 17:03:12
src/lib/msun/src/e_fmodf.c,v 1.6 2002/05/28 17:03:12
src/lib/msun/src/e_gamma.c,v 1.6 2002/05/28 17:03:12
src/lib/msun/src/e_gamma_r.c,v 1.6 2002/05/28 17:03:12
src/lib/msun/src/e_gammaf.c,v 1.6 2002/05/28 17:03:12
src/lib/msun/src/e_gammaf_r.c,v 1.7 2002/05/28 18:15:03
src/lib/msun/src/e_hypot.c,v 1.8 2002/05/28 18:15:03
src/lib/msun/src/e_hypotf.c,v 1.9 2002/05/28 18:15:03
src/lib/msun/src/e_j0.c,v 1.7 2002/05/28 18:15:03
src/lib/msun/src/e_j1.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_j1f.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_jn.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/e_jnf.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/e_lgamma.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_lgamma_r.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_lgammaf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_lgammaf_r.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_log.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/e_log10.c,v 1.9 2002/05/28 18:15:04
src/lib/msun/src/e_log10f.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/e_logf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_pow.c,v 1.9 2002/06/17 15:28:59
src/lib/msun/src/e_powf.c,v 1.9 2002/06/17 15:28:59
src/lib/msun/src/e_rem_pio2.c,v 1.7 2002/05/28 17:51:46
src/lib/msun/src/e_rem_pio2f.c,v 1.7 2002/05/28 17:51:46
src/lib/msun/src/e_remainder.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/e_remainderf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_scalb.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/e_scalbf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_sinh.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/e_sinhf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/e_sqrt.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/e_sqrtf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/k_cos.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/k_cosf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/k_rem_pio2.c,v 1.6 2002/05/28 17:51:46
src/lib/msun/src/k_rem_pio2f.c,v 1.6 2002/05/28 17:51:46
src/lib/msun/src/k_sin.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/k_sinf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/k_standard.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/k_tan.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/k_tanf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_asinh.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_asinhf.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_atan.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_atanf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_cbrt.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_cbrtf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_ceil.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_ceilf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_copysign.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_copysignf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_cos.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_cosf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_erf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_erff.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_expm1.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_expm1f.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_fabs.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_fabsf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_finite.c,v 1.7 2002/05/28 17:51:46
src/lib/msun/src/s_finitef.c,v 1.6 2002/05/28 17:51:46
src/lib/msun/src/s_floor.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_floorf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_frexp.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_frexpf.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_ilogb.c,v 1.7 2002/05/28 17:51:46
src/lib/msun/src/s_ilogbf.c,v 1.6 2002/05/28 17:51:46
src/lib/msun/src/s_isnan.c,v 1.6 2002/05/28 17:51:46
src/lib/msun/src/s_isnanf.c,v 1.6 2002/05/28 17:51:46
src/lib/msun/src/s_ldexp.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_ldexpf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_lib_version.c,v 1.5 1999/08/28 00:06:52
src/lib/msun/src/s_log1p.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_log1pf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_logb.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_logbf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_matherr.c,v 1.6 2002/05/28 17:51:46
src/lib/msun/src/s_modf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_modff.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_nextafter.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_nextafterf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_rint.c,v 1.9 2002/05/28 18:15:04
src/lib/msun/src/s_rintf.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_scalbn.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_scalbnf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_significand.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_significandf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_sin.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_sinf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_tan.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/s_tanf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_tanh.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/s_tanhf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_acos.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_acosf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_acosh.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_acoshf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_asin.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_asinf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_atan2.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_atan2f.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_atanh.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_atanhf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_cosh.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_coshf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_exp.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_expf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_fmod.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_fmodf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_gamma.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_gamma_r.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_gammaf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_gammaf_r.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_hypot.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_hypotf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_j0.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/w_j0f.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/w_j1.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/w_j1f.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/w_jn.c,v 1.9 2002/05/28 18:15:04
src/lib/msun/src/w_jnf.c,v 1.8 2002/05/28 18:15:04
src/lib/msun/src/w_lgamma.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_lgamma_r.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_lgammaf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_lgammaf_r.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_log.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_log10.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_log10f.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_logf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_pow.c,v 1.3 2002/05/28 17:51:46
src/lib/msun/src/w_powf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_remainder.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_remainderf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_scalb.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_scalbf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_sinh.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_sinhf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_sqrt.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_sqrtf.c,v 1.7 2002/05/28 18:15:04
src/lib/msun/src/w_y0.c,v 1.5 2002/05/28 18:15:04
src/lib/msun/src/w_y0f.c,v 1.5 2002/05/28 18:15:04
src/lib/msun/src/w_y1.c,v 1.5 2002/05/28 18:15:04
src/lib/msun/src/w_y1f.c,v 1.5 2002/05/28 18:15:04
src/lib/msun/src/w_yn.c,v 1.5 2002/05/28 18:15:04
src/lib/msun/src/w_ynf.c,v 1.5 2002/05/28 18:15:04
src/lib/msun/src/w_cabs.c,v 1.4 2001/06/13 15:16:30
src/lib/msun/src/w_cabsf.c,v 1.3 2001/06/13 15:16:30
src/lib/msun/src/get_hw_float.c,v 1.4 2002/03/21 23:54:04

>Description:
lib/msun/bsdsrc/b_exp.c:
  170: warning: unused variable 't'
    #>> variable t is really unused
   35: warning: 'sccsid' defined but not used
    #>> added 'const' qualifier to suppress the warning
lib/msun/bsdsrc/b_log.c:
   35: warning: 'sccsid' defined but not used
    #>> added 'const' qualifier to suppress the warning
lib/msun/bsdsrc/b_tgamma.c:
  157: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning
  160: warning: statement with no effect
    #>> no suggestion/patch, I don't know what the statement should do
    #>> ##############################################
    #>>             PLEASE REVIEW IT
    #>> ##############################################
  178: warning: unused variable 'i'
    #>> variable i is really unused
  207: warning: unused variable 'x1'
    #>> variable x1 is really unused
  270: warning: unused variable 'i'
    #>> variable i is really unused
  303: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning
   35: warning: 'sccsid' defined but not used
    #>> added 'const' qualifier to suppress the warning
lib/msun/src/e_log.c:
  109: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning
lib/msun/src/e_logf.c:
   60: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning
lib/msun/src/get_hw_float.c:
   46: warning: implicit declaration of function '__sysctl'
    #>> id should be 'sysctl' as '__sysctl' is something other
    #>> ##############################################
    #>>             PLEASE REVIEW IT
    #>> ##############################################
lib/msun/src/s_expm1.c:
  192: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning
lib/msun/src/s_expm1f.c:
   97: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning
lib/msun/src/s_log1p.c:
  149: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning
lib/msun/src/s_log1pf.c:
   88: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning
lib/msun/src/s_scalbn.c:
   50: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning
lib/msun/src/s_scalbnf.c:
   46: warning: suggest explicit braces to avoid ambiguous 'else'
    #>> added braces to suppress the warning

========
almost all lib/msun/src/*.c contain old tcsid definition thus trigering
"warning: 'rcsid' defined but not used". They are changed to use 
__FBSDID macro


>How-To-Repeat:
	N/A
>Fix:

--- lib/msun/bsdsrc/b_exp.c.ORIG	Tue Mar 26 12:59:29 2002
+++ lib/msun/bsdsrc/b_exp.c	Tue Sep  3 17:49:35 2002
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 6/4/93";
+static const char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_exp.c,v 1.5 2002/03/26 11:59:29 bde Exp $");
@@ -167,7 +167,7 @@
 double __exp__D(x, c)
 double x, c;
 {
-	double  z,hi,lo, t;
+	double  z,hi,lo;
 	int k;
 
 #if !defined(vax)&&!defined(tahoe)
--- lib/msun/bsdsrc/b_log.c.ORIG	Tue Mar 26 12:59:29 2002
+++ lib/msun/bsdsrc/b_log.c	Tue Sep  3 17:50:09 2002
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)log.c	8.2 (Berkeley) 11/30/93";
+static const char sccsid[] = "@(#)log.c	8.2 (Berkeley) 11/30/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_log.c,v 1.5 2002/03/26 11:59:29 bde Exp $");
--- lib/msun/bsdsrc/b_tgamma.c.ORIG	Tue Mar 26 12:59:29 2002
+++ lib/msun/bsdsrc/b_tgamma.c	Tue Sep  3 21:26:58 2002
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)gamma.c	8.1 (Berkeley) 6/4/93";
+static const char sccsid[] = "@(#)gamma.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_tgamma.c,v 1.5 2002/03/26 11:59:29 bde Exp $");
@@ -154,9 +154,10 @@
 	else if (x > 1.e-17)
 		return (smaller_gam(x));
 	else if (x > -1.e-17) {
-		if (x == 0.0)
+		if (x == 0.0) {
 			if (!_IEEE) return (infnan(ERANGE));
 			else return (one/x);
+                }
 		one+1e-20;		/* Raise inexact flag. */
 		return (one/x);
 	} else if (!finite(x)) {
@@ -175,7 +176,6 @@
 	double x;
 {
 	double z, p;
-	int i;
 	struct Double t, u, v;
 
 	z = one/(x*x);
@@ -204,7 +204,7 @@
 small_gam(x)
 	double x;
 {
-	double y, ym1, t, x1;
+	double y, ym1, t;
 	struct Double yy, r;
 	y = x - one;
 	ym1 = y - one;
@@ -267,7 +267,6 @@
 ratfun_gam(z, c)
 	double z, c;
 {
-	int i;
 	double p, q;
 	struct Double r, t;
 
@@ -300,11 +299,12 @@
 	double y, z;
 
 	y = floor(x + .5);
-	if (y == x)		/* Negative integer. */
+	if (y == x) {		/* Negative integer. */
 		if(!_IEEE)
 			return (infnan(ERANGE));
 		else
 			return (one/zero);
+	}
 	z = fabs(x - y);
 	y = .5*ceil(x);
 	if (y == ceil(y))
--- lib/msun/src/e_acos.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_acos.c	Tue Sep  3 18:30:12 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acos.c,v 1.8 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_acos.c,v 1.8 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_acos(x)
  * Method :
--- lib/msun/src/e_acosf.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_acosf.c	Tue Sep  3 18:41:34 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acosf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_acosf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_acosh.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_acosh.c	Tue Sep  3 18:43:50 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acosh.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_acosh.c,v 1.7 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_acosh(x)
  * Method :
--- lib/msun/src/e_acoshf.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_acoshf.c	Tue Sep  3 18:45:18 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acoshf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_acoshf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_asin.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_asin.c	Tue Sep  3 19:25:51 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_asin.c,v 1.9 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_asin.c,v 1.9 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_asin(x)
  * Method :
--- lib/msun/src/e_asinf.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_asinf.c	Tue Sep  3 19:00:17 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_asinf.c,v 1.8 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_asinf.c,v 1.8 2002/05/28 17:03:12 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_atan2.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_atan2.c	Tue Sep  3 19:25:41 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atan2.c,v 1.8 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2.c,v 1.8 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_atan2(y,x)
  * Method :
--- lib/msun/src/e_atan2f.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_atan2f.c	Tue Sep  3 18:59:58 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.6 2002/05/28 17:03:12 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_atanh.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_atanh.c	Tue Sep  3 19:25:32 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atanh.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_atanh.c,v 1.6 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_atanh(x)
  * Method :
--- lib/msun/src/e_atanhf.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_atanhf.c	Tue Sep  3 18:59:45 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atanhf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_atanhf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_cosh.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_cosh.c	Tue Sep  3 19:25:22 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_cosh.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_cosh.c,v 1.7 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_cosh(x)
  * Method :
--- lib/msun/src/e_coshf.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_coshf.c	Tue Sep  3 18:59:15 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_coshf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_coshf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_exp.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_exp.c	Tue Sep  3 19:25:12 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_exp.c,v 1.8 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_exp.c,v 1.8 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_exp(x)
  * Returns the exponential of x.
--- lib/msun/src/e_expf.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_expf.c	Tue Sep  3 19:40:04 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_expf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_expf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_fmod.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_fmod.c	Tue Sep  3 19:25:03 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_fmod.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_fmod.c,v 1.7 2002/05/28 17:03:12 alfred Exp $");
 
 /*
  * __ieee754_fmod(x,y)
--- lib/msun/src/e_fmodf.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_fmodf.c	Tue Sep  3 19:39:56 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_fmodf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_fmodf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $");
 
 /*
  * __ieee754_fmodf(x,y)
--- lib/msun/src/e_gamma.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_gamma.c	Tue Sep  3 19:24:55 2002
@@ -11,9 +11,8 @@
  *
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_gamma.c,v 1.6 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_gamma(x)
  * Return the logarithm of the Gamma function of x.
--- lib/msun/src/e_gamma_r.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_gamma_r.c	Tue Sep  3 19:39:47 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma_r.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_gamma_r.c,v 1.6 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_gamma_r(x, signgamp)
  * Reentrant version of the logarithm of the Gamma function
--- lib/msun/src/e_gammaf.c.ORIG	Mon Jul  1 22:54:46 2002
+++ lib/msun/src/e_gammaf.c	Tue Sep  3 19:24:46 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gammaf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_gammaf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $");
 
 /* __ieee754_gammaf(x)
  * Return the logarithm of the Gamma function of x.
--- lib/msun/src/e_gammaf_r.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_gammaf_r.c	Tue Sep  3 19:39:11 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gammaf_r.c,v 1.7 2002/05/28 18:15:03 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_gammaf_r.c,v 1.7 2002/05/28 18:15:03 alfred Exp $");
 
 /* __ieee754_gammaf_r(x, signgamp)
  * Reentrant version of the logarithm of the Gamma function
--- lib/msun/src/e_hypot.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_hypot.c	Tue Sep  3 19:24:36 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypot.c,v 1.8 2002/05/28 18:15:03 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_hypot.c,v 1.8 2002/05/28 18:15:03 alfred Exp $");
 
 /* __ieee754_hypot(x,y)
  *
--- lib/msun/src/e_hypotf.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_hypotf.c	Tue Sep  3 19:38:51 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.9 2002/05/28 18:15:03 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.9 2002/05/28 18:15:03 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_j0.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_j0.c	Tue Sep  3 20:16:21 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j0.c,v 1.7 2002/05/28 18:15:03 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_j0.c,v 1.7 2002/05/28 18:15:03 alfred Exp $");
 
 /* __ieee754_j0(x), __ieee754_y0(x)
  * Bessel function of the first and second kinds of order zero.
--- lib/msun/src/e_j0f.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_j0f.c	Tue Sep  3 20:16:53 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j0f.c,v 1.7 2002/05/28 18:15:03 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_j0f.c,v 1.7 2002/05/28 18:15:03 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_j1.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_j1.c	Tue Sep  3 20:16:12 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j1.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_j1.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* __ieee754_j1(x), __ieee754_y1(x)
  * Bessel function of the first and second kinds of order zero.
--- lib/msun/src/e_j1f.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_j1f.c	Tue Sep  3 20:16:36 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j1f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_j1f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_jn.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_jn.c	Tue Sep  3 20:20:30 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_jn.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_jn.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * __ieee754_jn(n, x), __ieee754_yn(n, x)
--- lib/msun/src/e_jnf.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_jnf.c	Tue Sep  3 19:38:11 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_jnf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_jnf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_lgamma.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_lgamma.c	Tue Sep  3 19:23:49 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_lgamma.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* __ieee754_lgamma(x)
  * Return the logarithm of the Gamma function of x.
--- lib/msun/src/e_lgamma_r.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_lgamma_r.c	Tue Sep  3 20:29:13 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_lgamma_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* __ieee754_lgamma_r(x, signgamp)
  * Reentrant version of the logarithm of the Gamma function
--- lib/msun/src/e_lgammaf.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_lgammaf.c	Tue Sep  3 19:23:39 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_lgammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* __ieee754_lgammaf(x)
  * Return the logarithm of the Gamma function of x.
--- lib/msun/src/e_lgammaf_r.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_lgammaf_r.c	Tue Sep  3 20:30:55 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgammaf_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_lgammaf_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_log.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_log.c	Tue Sep  3 20:38:52 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_log.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /* __ieee754_log(x)
  * Return the logrithm of x
@@ -107,8 +106,14 @@
 	k += (i>>20);
 	f = x-1.0;
 	if((0x000fffff&(2+hx))<3) {	/* |f| < 2**-20 */
-	    if(f==zero) if(k==0) return zero;  else {dk=(double)k;
-				 return dk*ln2_hi+dk*ln2_lo;}
+	    if(f==zero) {
+	        if(k==0) 
+	            return zero;  
+	        else {
+	            dk=(double)k;
+		    return dk*ln2_hi+dk*ln2_lo;
+		}
+	    }
 	    R = f*f*(0.5-0.33333333333333333*f);
 	    if(k==0) return f-R; else {dk=(double)k;
 	    	     return dk*ln2_hi-((R-dk*ln2_lo)-f);}
--- lib/msun/src/e_log10.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_log10.c	Tue Sep  3 19:37:46 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log10.c,v 1.9 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_log10.c,v 1.9 2002/05/28 18:15:04 alfred Exp $");
 
 /* __ieee754_log10(x)
  * Return the base 10 logarithm of x
--- lib/msun/src/e_log10f.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_log10f.c	Tue Sep  3 19:23:16 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log10f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_log10f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_logf.c.ORIG	Mon Jul  1 22:54:47 2002
+++ lib/msun/src/e_logf.c	Tue Sep  3 20:40:44 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_logf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_logf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
@@ -58,8 +57,14 @@
 	k += (i>>23);
 	f = x-(float)1.0;
 	if((0x007fffff&(15+ix))<16) {	/* |f| < 2**-20 */
-	    if(f==zero) if(k==0) return zero;  else {dk=(float)k;
-				 return dk*ln2_hi+dk*ln2_lo;}
+	    if(f==zero) {
+	        if(k==0) 
+	            return zero;  
+	        else {
+	            dk=(float)k;
+		    return dk*ln2_hi+dk*ln2_lo;
+		}
+	    }
 	    R = f*f*((float)0.5-(float)0.33333333333333333*f);
 	    if(k==0) return f-R; else {dk=(float)k;
 	    	     return dk*ln2_hi-((R-dk*ln2_lo)-f);}
--- lib/msun/src/e_pow.c.ORIG	Mon Jun 17 17:28:59 2002
+++ lib/msun/src/e_pow.c	Tue Sep  3 19:23:06 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_pow.c,v 1.9 2002/06/17 15:28:59 bde Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_pow.c,v 1.9 2002/06/17 15:28:59 bde Exp $");
 
 /* __ieee754_pow(x,y) return x**y
  *
--- lib/msun/src/e_powf.c.ORIG	Mon Jun 17 17:28:59 2002
+++ lib/msun/src/e_powf.c	Tue Sep  3 19:37:26 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_powf.c,v 1.9 2002/06/17 15:28:59 bde Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_powf.c,v 1.9 2002/06/17 15:28:59 bde Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_rem_pio2.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_rem_pio2.c	Tue Sep  3 20:43:23 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.7 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.7 2002/05/28 17:51:46 alfred Exp $");
 
 /* __ieee754_rem_pio2(x,y)
  *
--- lib/msun/src/e_rem_pio2f.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_rem_pio2f.c	Tue Sep  3 19:37:17 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.7 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.7 2002/05/28 17:51:46 alfred Exp $");
 
 /* __ieee754_rem_pio2f(x,y)
  *
--- lib/msun/src/e_remainder.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_remainder.c	Tue Sep  3 19:22:45 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainder.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_remainder.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /* __ieee754_remainder(x,p)
  * Return :
--- lib/msun/src/e_remainderf.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_remainderf.c	Tue Sep  3 19:37:08 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_scalb.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_scalb.c	Tue Sep  3 19:22:34 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalb.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_scalb.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * __ieee754_scalb(x, fn) is provide for
--- lib/msun/src/e_scalbf.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_scalbf.c	Tue Sep  3 19:36:59 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_sinh.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_sinh.c	Tue Sep  3 19:22:24 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sinh.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_sinh.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /* __ieee754_sinh(x)
  * Method :
--- lib/msun/src/e_sinhf.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_sinhf.c	Tue Sep  3 19:36:48 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sinhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_sinhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/e_sqrt.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_sqrt.c	Tue Sep  3 19:22:13 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sqrt.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_sqrt.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /* __ieee754_sqrt(x)
  * Return correctly rounded sqrt.
--- lib/msun/src/e_sqrtf.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/e_sqrtf.c	Tue Sep  3 19:36:39 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sqrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_sqrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/get_hw_float.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/get_hw_float.c	Tue Sep  3 20:51:51 2002
@@ -43,7 +43,7 @@
 		len = sizeof(hw_float);
 		mib[0] = CTL_HW;
 		mib[1] = HW_FLOATINGPT;
-		if (__sysctl(mib, 2, &hw_float, &len, (void *)0, 0) == -1)
+		if (sysctl(mib, 2, &hw_float, &len, (void *)0, 0) == -1)
 			hw_float = 0;	/* shouldn't happen; assume the worst */
 	}
 	return (hw_float);
--- lib/msun/src/k_cos.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/k_cos.c	Tue Sep  3 19:22:01 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cos.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/k_cos.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * __kernel_cos( x,  y )
--- lib/msun/src/k_cosf.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/k_cosf.c	Tue Sep  3 19:36:31 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/k_rem_pio2.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/k_rem_pio2.c	Tue Sep  3 19:21:49 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.6 2002/05/28 17:51:46 alfred Exp $");
 
 /*
  * __kernel_rem_pio2(x,y,e0,nx,prec,ipio2)
--- lib/msun/src/k_rem_pio2f.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/k_rem_pio2f.c	Tue Sep  3 19:36:22 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2f.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2f.c,v 1.6 2002/05/28 17:51:46 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/k_sin.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/k_sin.c	Tue Sep  3 19:21:37 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_sin.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/k_sin.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* __kernel_sin( x, y, iy)
  * kernel sin function on [-pi/4, pi/4], pi/4 ~ 0.7854
--- lib/msun/src/k_sinf.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/k_sinf.c	Tue Sep  3 19:36:11 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/k_standard.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/k_standard.c	Tue Sep  3 19:21:27 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_standard.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/k_standard.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/k_tan.c.ORIG	Mon Jul  1 22:54:48 2002
+++ lib/msun/src/k_tan.c	Tue Sep  3 19:36:02 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_tan.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/k_tan.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* __kernel_tan( x, y, k )
  * kernel tan function on [-pi/4, pi/4], pi/4 ~ 0.7854
--- lib/msun/src/k_tanf.c.ORIG	Mon Jul  1 22:54:49 2002
+++ lib/msun/src/k_tanf.c	Tue Sep  3 19:21:14 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_asinh.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_asinh.c	Tue Sep  3 19:35:54 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_asinh.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_asinh.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /* asinh(x)
  * Method :
--- lib/msun/src/s_asinhf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_asinhf.c	Tue Sep  3 19:21:03 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_asinhf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_asinhf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_atan.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_atan.c	Tue Sep  3 19:35:46 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_atan.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_atan.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /* atan(x)
  * Method
--- lib/msun/src/s_atanf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_atanf.c	Tue Sep  3 19:20:54 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_atanf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_atanf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_cbrt.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_cbrt.c	Tue Sep  3 19:35:38 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_cbrtf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_cbrtf.c	Tue Sep  3 19:20:43 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_ceil.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_ceil.c	Tue Sep  3 19:35:28 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceil.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_ceil.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * ceil(x)
--- lib/msun/src/s_ceilf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_ceilf.c	Tue Sep  3 19:20:22 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceilf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_ceilf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_copysign.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_copysign.c	Tue Sep  3 19:35:19 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_copysign.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_copysign.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * copysign(double x, double y)
--- lib/msun/src/s_copysignf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_copysignf.c	Tue Sep  3 19:20:03 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_copysignf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_copysignf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * copysignf(float x, float y)
--- lib/msun/src/s_cos.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_cos.c	Tue Sep  3 19:35:10 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cos.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_cos.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /* cos(x)
  * Return cosine function of x.
--- lib/msun/src/s_cosf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_cosf.c	Tue Sep  3 19:19:49 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_erf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_erf.c	Tue Sep  3 19:34:58 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_erf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_erf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* double erf(double x)
  * double erfc(double x)
--- lib/msun/src/s_erff.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_erff.c	Tue Sep  3 19:19:36 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_erff.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_erff.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_expm1.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_expm1.c	Tue Sep  3 21:02:49 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_expm1.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_expm1.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* expm1(x)
  * Returns exp(x)-1, the exponential of x minus 1.
@@ -190,9 +189,10 @@
 	    e  = (x*(e-c)-c);
 	    e -= hxs;
 	    if(k== -1) return 0.5*(x-e)-0.5;
-	    if(k==1)
+	    if(k==1) {
 	       	if(x < -0.25) return -2.0*(e-(x+0.5));
 	       	else 	      return  one+2.0*(x-e);
+            }
 	    if (k <= -2 || k>56) {   /* suffice to return exp(x)-1 */
 	        u_int32_t high;
 	        y = one-(e-x);
--- lib/msun/src/s_expm1f.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_expm1f.c	Tue Sep  3 21:04:18 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_expm1f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_expm1f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
@@ -95,9 +94,10 @@
 	    e  = (x*(e-c)-c);
 	    e -= hxs;
 	    if(k== -1) return (float)0.5*(x-e)-(float)0.5;
-	    if(k==1)
+	    if(k==1) {
 	       	if(x < (float)-0.25) return -(float)2.0*(e-(x+(float)0.5));
 	       	else 	      return  one+(float)2.0*(x-e);
+            }
 	    if (k <= -2 || k>56) {   /* suffice to return exp(x)-1 */
 	        int32_t i;
 	        y = one-(e-x);
--- lib/msun/src/s_fabs.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_fabs.c	Tue Sep  3 19:34:38 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_fabs.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fabs.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * fabs(x) returns the absolute value of x.
--- lib/msun/src/s_fabsf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_fabsf.c	Tue Sep  3 19:19:15 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_fabsf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fabsf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * fabsf(x) returns the absolute value of x.
--- lib/msun/src/s_finite.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_finite.c	Tue Sep  3 19:34:30 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_finite.c,v 1.7 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_finite.c,v 1.7 2002/05/28 17:51:46 alfred Exp $");
 
 /*
  * finite(x) returns 1 is x is finite, else 0;
--- lib/msun/src/s_finitef.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_finitef.c	Tue Sep  3 19:19:06 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_finitef.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_finitef.c,v 1.6 2002/05/28 17:51:46 alfred Exp $");
 
 /*
  * finitef(x) returns 1 is x is finite, else 0;
--- lib/msun/src/s_floor.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_floor.c	Tue Sep  3 19:34:22 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floor.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_floor.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * floor(x)
--- lib/msun/src/s_floorf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_floorf.c	Tue Sep  3 19:18:57 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_floorf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * floorf(x)
--- lib/msun/src/s_frexp.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_frexp.c	Tue Sep  3 19:34:14 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_frexp.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_frexp.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * for non-zero x
--- lib/msun/src/s_frexpf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_frexpf.c	Tue Sep  3 19:18:34 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_frexpf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_frexpf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_ilogb.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_ilogb.c	Tue Sep  3 19:34:03 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogb.c,v 1.7 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_ilogb.c,v 1.7 2002/05/28 17:51:46 alfred Exp $");
 
 /* ilogb(double x)
  * return the binary exponent of non-zero x
--- lib/msun/src/s_ilogbf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_ilogbf.c	Tue Sep  3 19:18:25 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogbf.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_ilogbf.c,v 1.6 2002/05/28 17:51:46 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_isnan.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_isnan.c	Tue Sep  3 19:33:54 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_isnan.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_isnan.c,v 1.6 2002/05/28 17:51:46 alfred Exp $");
 
 /*
  * isnan(x) returns 1 is x is nan, else 0;
--- lib/msun/src/s_isnanf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_isnanf.c	Tue Sep  3 19:18:15 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_isnanf.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_isnanf.c,v 1.6 2002/05/28 17:51:46 alfred Exp $");
 
 /*
  * isnanf(x) returns 1 is x is nan, else 0;
--- lib/msun/src/s_ldexp.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_ldexp.c	Tue Sep  3 19:33:24 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ldexp.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_ldexp.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_ldexpf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_ldexpf.c	Tue Sep  3 19:18:05 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ldexpf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_ldexpf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_lib_version.c.ORIG	Sat Aug 28 02:06:52 1999
+++ lib/msun/src/s_lib_version.c	Tue Sep  3 19:33:06 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_lib_version.c,v 1.5 1999/08/28 00:06:52 peter Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lib_version.c,v 1.5 1999/08/28 00:06:52 peter Exp $");
 
 /*
  * MACRO for standards
--- lib/msun/src/s_log1p.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_log1p.c	Tue Sep  3 21:12:04 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1p.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_log1p.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* double log1p(double x)
  *
@@ -147,8 +146,14 @@
 	}
 	hfsq=0.5*f*f;
 	if(hu==0) {	/* |f| < 2**-20 */
-	    if(f==zero) if(k==0) return zero;
-			else {c += k*ln2_lo; return k*ln2_hi+c;}
+	    if(f==zero) { 
+	        if(k==0) 
+	            return zero;
+		else {
+		    c += k*ln2_lo; 
+		    return k*ln2_hi+c;
+		}
+            }
 	    R = hfsq*(1.0-0.66666666666666666*f);
 	    if(k==0) return f-R; else
 	    	     return k*ln2_hi-((R-(k*ln2_lo+c))-f);
--- lib/msun/src/s_log1pf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_log1pf.c	Tue Sep  3 21:15:32 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
@@ -86,8 +85,14 @@
 	}
 	hfsq=(float)0.5*f*f;
 	if(hu==0) {	/* |f| < 2**-20 */
-	    if(f==zero) if(k==0) return zero;
-			else {c += k*ln2_lo; return k*ln2_hi+c;}
+	    if(f==zero) {
+	        if(k==0) 
+	            return zero;
+		else {
+		    c += k*ln2_lo; 
+		    return k*ln2_hi+c;
+		}
+	    }
 	    R = hfsq*((float)1.0-(float)0.66666666666666666*f);
 	    if(k==0) return f-R; else
 	    	     return k*ln2_hi-((R-(k*ln2_lo+c))-f);
--- lib/msun/src/s_logb.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_logb.c	Tue Sep  3 19:17:10 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_logb.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_logb.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * double logb(x)
--- lib/msun/src/s_logbf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_logbf.c	Tue Sep  3 19:32:46 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_logbf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_logbf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_matherr.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_matherr.c	Tue Sep  3 19:16:45 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_matherr.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_matherr.c,v 1.6 2002/05/28 17:51:46 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_modf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_modf.c	Tue Sep  3 19:32:37 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_modf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * modf(double x, double *iptr)
--- lib/msun/src/s_modff.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_modff.c	Tue Sep  3 19:16:05 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modff.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_modff.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_nextafter.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_nextafter.c	Tue Sep  3 19:32:27 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafter.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_nextafter.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* IEEE functions
  *	nextafter(x,y)
--- lib/msun/src/s_nextafterf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_nextafterf.c	Tue Sep  3 19:15:49 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafterf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_nextafterf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_rint.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_rint.c	Tue Sep  3 19:32:17 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rint.c,v 1.9 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_rint.c,v 1.9 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * rint(x)
--- lib/msun/src/s_rintf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_rintf.c	Tue Sep  3 19:15:35 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_scalbn.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_scalbn.c	Tue Sep  3 21:20:03 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbn.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_scalbn.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * scalbn (double x, int n)
@@ -48,10 +47,11 @@
         if (k >  0x7fe) return huge*copysign(huge,x); /* overflow  */
         if (k > 0) 				/* normal result */
 	    {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;}
-        if (k <= -54)
+        if (k <= -54) {
             if (n > 50000) 	/* in case integer overflow in n+k */
 		return huge*copysign(huge,x);	/*overflow*/
 	    else return tiny*copysign(tiny,x); 	/*underflow*/
+        }
         k += 54;				/* subnormal result */
 	SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20));
         return x*twom54;
--- lib/msun/src/s_scalbnf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_scalbnf.c	Tue Sep  3 21:21:00 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbnf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_scalbnf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
@@ -44,10 +43,11 @@
         if (k >  0xfe) return huge*copysignf(huge,x); /* overflow  */
         if (k > 0) 				/* normal result */
 	    {SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23)); return x;}
-        if (k <= -25)
+        if (k <= -25) {
             if (n > 50000) 	/* in case integer overflow in n+k */
 		return huge*copysignf(huge,x);	/*overflow*/
 	    else return tiny*copysignf(tiny,x);	/*underflow*/
+        }
         k += 25;				/* subnormal result */
 	SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23));
         return x*twom25;
--- lib/msun/src/s_significand.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_significand.c	Tue Sep  3 19:31:59 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_significand.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_significand.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * significand(x) computes just
--- lib/msun/src/s_significandf.c.ORIG	Mon Jul  1 22:54:50 2002
+++ lib/msun/src/s_significandf.c	Tue Sep  3 19:14:45 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_significandf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_significandf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_sin.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/s_sin.c	Tue Sep  3 19:31:49 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_sin.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_sin.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /* sin(x)
  * Return sine function of x.
--- lib/msun/src/s_sinf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/s_sinf.c	Tue Sep  3 19:14:20 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_tan.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/s_tan.c	Tue Sep  3 19:31:40 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tan.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_tan.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /* tan(x)
  * Return tangent function of x.
--- lib/msun/src/s_tanf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/s_tanf.c	Tue Sep  3 19:14:04 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/s_tanh.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/s_tanh.c	Tue Sep  3 19:31:28 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_tanh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* Tanh(x)
  * Return the Hyperbolic Tangent of x
--- lib/msun/src/s_tanhf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/s_tanhf.c	Tue Sep  3 19:13:41 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_tanhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/w_acos.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_acos.c	Tue Sep  3 19:31:20 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acos.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_acos.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrap_acos(x)
--- lib/msun/src/w_acosf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_acosf.c	Tue Sep  3 19:09:10 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_acosf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrap_acosf(x)
--- lib/msun/src/w_acosh.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_acosh.c	Tue Sep  3 19:31:13 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acosh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_acosh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper acosh(x)
--- lib/msun/src/w_acoshf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_acoshf.c	Tue Sep  3 19:08:55 2002
@@ -14,9 +14,8 @@
  *
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acoshf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_acoshf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper acoshf(x)
--- lib/msun/src/w_asin.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_asin.c	Tue Sep  3 19:31:05 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_asin.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_asin.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper asin(x)
--- lib/msun/src/w_asinf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_asinf.c	Tue Sep  3 19:08:43 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_asinf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_asinf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper asinf(x)
--- lib/msun/src/w_atan2.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_atan2.c	Tue Sep  3 19:30:54 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atan2.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_atan2.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper atan2(y,x)
--- lib/msun/src/w_atan2f.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_atan2f.c	Tue Sep  3 19:08:23 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atan2f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_atan2f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper atan2f(y,x)
--- lib/msun/src/w_atanh.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_atanh.c	Tue Sep  3 19:30:43 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atanh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_atanh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper atanh(x)
--- lib/msun/src/w_atanhf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_atanhf.c	Tue Sep  3 19:08:09 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atanhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_atanhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper atanhf(x)
--- lib/msun/src/w_cabs.c.ORIG	Wed Jun 13 17:16:30 2001
+++ lib/msun/src/w_cabs.c	Tue Sep  3 19:30:32 2002
@@ -5,10 +5,8 @@
  * Placed into the Public Domain, 1994.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD: src/lib/msun/src/w_cabs.c,v 1.4 2001/06/13 15:16:30 ru Exp $";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_cabs.c,v 1.4 2001/06/13 15:16:30 ru Exp $");
 
 #include <complex.h>
 #include <math.h>
--- lib/msun/src/w_cabsf.c.ORIG	Wed Jun 13 17:16:30 2001
+++ lib/msun/src/w_cabsf.c	Tue Sep  3 19:07:30 2002
@@ -5,10 +5,8 @@
  * Placed into the Public Domain, 1994.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD: src/lib/msun/src/w_cabsf.c,v 1.3 2001/06/13 15:16:30 ru Exp $";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_cabsf.c,v 1.3 2001/06/13 15:16:30 ru Exp $");
 
 #include <complex.h>
 #include <math.h>
--- lib/msun/src/w_cosh.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_cosh.c	Tue Sep  3 19:30:07 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_cosh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_cosh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper cosh(x)
--- lib/msun/src/w_coshf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_coshf.c	Tue Sep  3 19:06:41 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_coshf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_coshf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper coshf(x)
--- lib/msun/src/w_exp.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_exp.c	Tue Sep  3 19:29:49 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_exp.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_exp.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper exp(x)
--- lib/msun/src/w_expf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_expf.c	Tue Sep  3 19:06:26 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_expf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_expf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper expf(x)
--- lib/msun/src/w_fmod.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_fmod.c	Tue Sep  3 19:29:39 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_fmod.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_fmod.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper fmod(x,y)
--- lib/msun/src/w_fmodf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_fmodf.c	Tue Sep  3 19:06:13 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_fmodf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_fmodf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper fmodf(x,y)
--- lib/msun/src/w_gamma.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_gamma.c	Tue Sep  3 19:29:27 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gamma.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_gamma.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* double gamma(double x)
  * Return the logarithm of the Gamma function of x.
--- lib/msun/src/w_gamma_r.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_gamma_r.c	Tue Sep  3 19:06:00 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gamma_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_gamma_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper double gamma_r(double x, int *signgamp)
--- lib/msun/src/w_gammaf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_gammaf.c	Tue Sep  3 19:29:14 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_gammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/w_gammaf_r.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_gammaf_r.c	Tue Sep  3 19:05:43 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gammaf_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_gammaf_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper float gammaf_r(float x, int *signgamp)
--- lib/msun/src/w_hypot.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_hypot.c	Tue Sep  3 19:29:05 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_hypot.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_hypot.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper hypot(x,y)
--- lib/msun/src/w_hypotf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_hypotf.c	Tue Sep  3 19:05:30 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_hypotf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_hypotf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper hypotf(x,y)
--- lib/msun/src/w_j0.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_j0.c	Tue Sep  3 19:28:53 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j0.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_j0.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper j0(double x)
--- lib/msun/src/w_j0f.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_j0f.c	Tue Sep  3 19:05:12 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j0f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_j0f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper j0f(float x)
--- lib/msun/src/w_j1.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_j1.c	Tue Sep  3 21:21:29 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j1.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_j1.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper of j1
--- lib/msun/src/w_j1f.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_j1f.c	Tue Sep  3 19:04:55 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j1f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_j1f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper of j1f
--- lib/msun/src/w_jn.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_jn.c	Tue Sep  3 21:21:43 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_jn.c,v 1.9 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_jn.c,v 1.9 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper jn(int n, double x)
--- lib/msun/src/w_jnf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_jnf.c	Tue Sep  3 19:04:37 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_jnf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_jnf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/w_lgamma.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_lgamma.c	Tue Sep  3 21:22:07 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgamma.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_lgamma.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /* double lgamma(double x)
  * Return the logarithm of the Gamma function of x.
--- lib/msun/src/w_lgamma_r.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_lgamma_r.c	Tue Sep  3 19:04:12 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgamma_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_lgamma_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper double lgamma_r(double x, int *signgamp)
--- lib/msun/src/w_lgammaf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_lgammaf.c	Tue Sep  3 21:22:24 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_lgammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
--- lib/msun/src/w_lgammaf_r.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_lgammaf_r.c	Tue Sep  3 19:04:00 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgammaf_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_lgammaf_r.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper float lgammaf_r(float x, int *signgamp)
--- lib/msun/src/w_log.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_log.c	Tue Sep  3 21:22:40 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_log.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_log.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper log(x)
--- lib/msun/src/w_log10.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_log10.c	Tue Sep  3 19:03:43 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_log10.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_log10.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper log10(X)
--- lib/msun/src/w_log10f.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_log10f.c	Tue Sep  3 21:22:56 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_log10f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_log10f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper log10f(X)
--- lib/msun/src/w_logf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_logf.c	Tue Sep  3 19:03:30 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_logf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_logf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper logf(x)
--- lib/msun/src/w_pow.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_pow.c	Tue Sep  3 21:23:10 2002
@@ -1,5 +1,3 @@
-
-
 /* @(#)w_pow.c 5.2 93/10/01 */
 /*
  * ====================================================
@@ -16,12 +14,11 @@
  * wrapper pow(x,y) return x**y
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_pow.c,v 1.3 2002/05/28 17:51:46 alfred Exp $");
+
 #include "math.h"
 #include "math_private.h"
-
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_pow.c,v 1.3 2002/05/28 17:51:46 alfred Exp $";
-#endif
 
 double
 pow(double x, double y)	/* wrapper pow */
--- lib/msun/src/w_powf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_powf.c	Tue Sep  3 19:03:11 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_powf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_powf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper powf(x,y) return x**y
--- lib/msun/src/w_remainder.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_remainder.c	Tue Sep  3 19:27:08 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_remainder.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_remainder.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper remainder(x,p)
--- lib/msun/src/w_remainderf.c.ORIG	Mon Jul  1 22:54:51 2002
+++ lib/msun/src/w_remainderf.c	Tue Sep  3 19:02:59 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_remainderf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_remainderf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper remainderf(x,p)
--- lib/msun/src/w_scalb.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_scalb.c	Tue Sep  3 19:26:59 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_scalb.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_scalb.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper scalb(double x, double fn) is provide for
--- lib/msun/src/w_scalbf.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_scalbf.c	Tue Sep  3 19:01:48 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_scalbf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_scalbf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper scalbf(float x, float fn) is provide for
--- lib/msun/src/w_sinh.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_sinh.c	Tue Sep  3 19:26:50 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sinh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_sinh.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper sinh(x)
--- lib/msun/src/w_sinhf.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_sinhf.c	Tue Sep  3 19:01:37 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sinhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_sinhf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper sinhf(x)
--- lib/msun/src/w_sqrt.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_sqrt.c	Tue Sep  3 19:26:41 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sqrt.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_sqrt.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper sqrt(x)
--- lib/msun/src/w_sqrtf.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_sqrtf.c	Tue Sep  3 19:01:26 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sqrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_sqrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper sqrtf(x)
--- lib/msun/src/w_y0.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_y0.c	Tue Sep  3 19:26:20 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y0.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_y0.c,v 1.5 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper y0(double x)
--- lib/msun/src/w_y0f.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_y0f.c	Tue Sep  3 19:01:14 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y0f.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_y0f.c,v 1.5 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper y0f(float x)
--- lib/msun/src/w_y1.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_y1.c	Tue Sep  3 19:26:09 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y1.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_y1.c,v 1.5 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper of y1
--- lib/msun/src/w_y1f.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_y1f.c	Tue Sep  3 19:01:04 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y1f.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_y1f.c,v 1.5 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper of y1f
--- lib/msun/src/w_yn.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_yn.c	Tue Sep  3 19:26:01 2002
@@ -10,9 +10,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_yn.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_yn.c,v 1.5 2002/05/28 18:15:04 alfred Exp $");
 
 /*
  * wrapper yn(int n, double x)
--- lib/msun/src/w_ynf.c.ORIG	Mon Jul  1 22:54:52 2002
+++ lib/msun/src/w_ynf.c	Tue Sep  3 19:00:51 2002
@@ -13,9 +13,8 @@
  * ====================================================
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_ynf.c,v 1.5 2002/05/28 18:15:04 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/w_ynf.c,v 1.5 2002/05/28 18:15:04 alfred Exp $");
 
 #include "math.h"
 #include "math_private.h"
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209031931.g83JVKGS006470>