[src/trunk]: src/sys/altq rename the altq-defined INFINITY symbol to ALTQ_INF...

[plunky <plunky%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0566fca85fab
branches:  trunk
changeset: 753777:0566fca85fab
user:      plunky <plunky%NetBSD.org@localhost>
date:      Fri Apr 09 19:32:45 2010 +0000

description:
rename the altq-defined INFINITY symbol to ALTQ_INFINITY

    - it is not infinity
    - it is exposed to userland
    - it causes confusion when #include <math.h> follows
      (I don't know why GCC does not object to redefining the symbol)

diffstat:

 sys/altq/altq_jobs.c |  14 +++++++-------
 sys/altq/altq_jobs.h |   6 ++----
 2 files changed, 9 insertions(+), 11 deletions(-)

diffs (77 lines):

diff -r 1751f65d3488 -r 0566fca85fab sys/altq/altq_jobs.c
--- a/sys/altq/altq_jobs.c      Fri Apr 09 19:25:52 2010 +0000
+++ b/sys/altq/altq_jobs.c      Fri Apr 09 19:32:45 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: altq_jobs.c,v 1.5 2007/03/04 05:59:01 christos Exp $   */
+/*     $NetBSD: altq_jobs.c,v 1.6 2010/04/09 19:32:45 plunky Exp $     */
 /*     $KAME: altq_jobs.c,v 1.11 2005/04/13 03:44:25 suz Exp $ */
 /*
  * Copyright (c) 2001, the Rector and Board of Visitors of the
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.5 2007/03/04 05:59:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.6 2010/04/09 19:32:45 plunky Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
@@ -169,11 +169,11 @@
        jif->wc_cycles_enqueue = 0;
        jif->avg_cycles_enqueue = 0;
        jif->avg_cycles2_enqueue = 0;
-       jif->bc_cycles_enqueue = INFINITY;
+       jif->bc_cycles_enqueue = ALTQ_INFINITY;
        jif->wc_cycles_dequeue = 0;
        jif->avg_cycles_dequeue = 0;
        jif->avg_cycles2_dequeue = 0;
-       jif->bc_cycles_dequeue = INFINITY;
+       jif->bc_cycles_dequeue = ALTQ_INFINITY;
        jif->total_enqueued = 0;
        jif->total_dequeued = 0;
 
@@ -315,13 +315,13 @@
 
        if (adc == -1) {
                cl->concerned_adc = 0;
-               adc = INFINITY;
+               adc = ALTQ_INFINITY;
        } else 
                cl->concerned_adc = 1;
 
        if (alc == -1) {
                cl->concerned_alc = 0;
-               alc = INFINITY;
+               alc = ALTQ_INFINITY;
        } else 
                cl->concerned_alc = 1;
 
@@ -1730,7 +1730,7 @@
                                loss_error[i]=cl->loss_prod_others
                                    *cl->current_loss-mean;
                        else
-                               loss_error[i] = INFINITY;
+                               loss_error[i] = ALTQ_INFINITY;
                }
 
                for (i = 0; i <= jif->jif_maxpri; i++) {
diff -r 1751f65d3488 -r 0566fca85fab sys/altq/altq_jobs.h
--- a/sys/altq/altq_jobs.h      Fri Apr 09 19:25:52 2010 +0000
+++ b/sys/altq/altq_jobs.h      Fri Apr 09 19:32:45 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: altq_jobs.h,v 1.4 2008/08/29 00:40:42 gmcgarry Exp $   */
+/*     $NetBSD: altq_jobs.h,v 1.5 2010/04/09 19:32:45 plunky Exp $     */
 /*     $KAME: altq_jobs.h,v 1.6 2003/07/10 12:07:48 kjc Exp $  */
 /*
  * Copyright (c) 2001, Rector and Visitors of the University of 
@@ -69,9 +69,7 @@
 #define SCALE_LOSS     32
 #define SCALE_SHARE    16
 #define GRANULARITY    1000000 /* microseconds */
-#ifndef INFINITY
-#define INFINITY       LLONG_MAX
-#endif
+#define ALTQ_INFINITY  LLONG_MAX       /* not infinite, just large */
 
 /* list of packet arrival times */
 struct _tsentry;