rename INFINITY -> WEB_INFINITY to avoid name conflict with INFINITY from cygwin <math.h>

git-svn-id: svn://tug.org/texlive/trunk@13578 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 34 insertions, 24 deletions

diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog
index dd243a3f692..5408e3ffcfa 100644
--- a/Build/source/texk/dvipos/ChangeLog
+++ b/Build/source/texk/dvipos/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* dvicore.c, utils.h: rename INFINITY -> WEB_INFINITY, to avoid
+	name conflict with INFINITY from cygwin <math.h>.
+
 2009-05-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to TL2009 build system.
diff --git a/Build/source/texk/dvipos/dvicore.c b/Build/source/texk/dvipos/dvicore.c
index 0abfb13b063..06bc4ee99b8 100644
--- a/Build/source/texk/dvipos/dvicore.c
+++ b/Build/source/texk/dvipos/dvicore.c
@@ -79,7 +79,7 @@ static void calc_bbox (SIGNED_QUAD width, SIGNED_QUAD height, SIGNED_QUAD depth)
   if (do_smashchars) height = depth = 0;
 
   while (bb) {
-    if (bb->fb == -INFINITY) bb->fb = dvi_state.v;
+    if (bb->fb == -WEB_INFINITY) bb->fb = dvi_state.v;
     bb->cb = dvi_state.v;
     if (bb->h1 > dvi_state.h) bb->h1 = dvi_state.h;
     if (bb->v1 > dvi_state.v - height) bb->v1 = dvi_state.v - height;
@@ -173,9 +173,9 @@ static void draw_frame (BBOX *bb)
 
 static void reset_bbox (BBOX *bb)
 {
-  bb->h1 = bb->v1 = INFINITY;
-  bb->h2 = bb->v2 = -INFINITY;
-  bb->fb = bb->cb = -INFINITY;
+  bb->h1 = bb->v1 = WEB_INFINITY;
+  bb->h2 = bb->v2 = -WEB_INFINITY;
+  bb->fb = bb->cb = -WEB_INFINITY;
 }
 
 static void clear_bbox (int init)
@@ -384,7 +384,7 @@ static void out_text (char c)
   dvi_buffer[dvi_buffer_len++] = c;
 }
 
-#define INFINITY 0x7FFFFFFFL //017777777777
+#define WEB_INFINITY 0x7FFFFFFFL //017777777777
 #define MAX_DRIFT 2
 #define PIXEL_ROUND(p) xround(conv*(p))
 
@@ -394,13 +394,13 @@ static void move_right (SIGNED_QUAD q)
 
   h = dvi_state.h; hh = dvi_state.hh;
 
-  if (h > 0 && q > 0 && h > INFINITY - q) {
-    msg_out(M_DEBUG, " arithmetic overflow! parameter changed from '%ld' to '%ld'\n", q, INFINITY - h);
-    q = INFINITY - h;
+  if (h > 0 && q > 0 && h > WEB_INFINITY - q) {
+    msg_out(M_DEBUG, " arithmetic overflow! parameter changed from '%ld' to '%ld'\n", q, WEB_INFINITY - h);
+    q = WEB_INFINITY - h;
   }
-  if (h < 0 && q < 0 && -h > q + INFINITY) {
-    msg_out(M_DEBUG, " arithmetic overflow! parameter changed from '%ld' to '%ld'\n", q, (-h) - INFINITY);
-    q = (-h) - INFINITY;
+  if (h < 0 && q < 0 && -h > q + WEB_INFINITY) {
+    msg_out(M_DEBUG, " arithmetic overflow! parameter changed from '%ld' to '%ld'\n", q, (-h) - WEB_INFINITY);
+    q = (-h) - WEB_INFINITY;
   }
   hhh = PIXEL_ROUND(h + q);
   if (labs(hhh - hh) > MAX_DRIFT) {
@@ -429,13 +429,13 @@ static void move_down (SIGNED_QUAD p)
 
   v = dvi_state.v; vv = dvi_state.vv;
 
-  if (v > 0 && p > 0 && v > INFINITY - p) {
-    msg_out(M_DEBUG, " arithmetic overflow! parameter changed from '%ld' to '%ld'\n", p, INFINITY - v);
-    p = INFINITY - v;
+  if (v > 0 && p > 0 && v > WEB_INFINITY - p) {
+    msg_out(M_DEBUG, " arithmetic overflow! parameter changed from '%ld' to '%ld'\n", p, WEB_INFINITY - v);
+    p = WEB_INFINITY - v;
   }
-  if (v < 0 && p < 0 && -v > p + INFINITY) {
-    msg_out(M_DEBUG, " arithmetic overflow! parameter changed from '%ld' to '%ld'\n", p, (-v) - INFINITY);
-    p = (-v) - INFINITY;
+  if (v < 0 && p < 0 && -v > p + WEB_INFINITY) {
+    msg_out(M_DEBUG, " arithmetic overflow! parameter changed from '%ld' to '%ld'\n", p, (-v) - WEB_INFINITY);
+    p = (-v) - WEB_INFINITY;
   }
   vvv = PIXEL_ROUND(v + p);
   if (labs(vvv - vv) > MAX_DRIFT) {
diff --git a/Build/source/texk/dvipos/utils.h b/Build/source/texk/dvipos/utils.h
index 1802b8237a6..7399482dd76 100644
--- a/Build/source/texk/dvipos/utils.h
+++ b/Build/source/texk/dvipos/utils.h
@@ -78,7 +78,7 @@ extern FILE *infp, *outfp, *bbxfp, *frmfp;
 extern char *infname, *bbxfname, *frmfname;
 extern SIGNED_QUAD dbg_location, rule_width;
 
-#define INFINITY 0x7FFFFFFFL //017777777777
+#define WEB_INFINITY 0x7FFFFFFFL //017777777777
 
 #define VERSION "20070107"
 
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index 68d7f7eacb9..b5d76862253 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* dimen_routines.c, manifests.h: rename INFINITY -> WEB_INFINITY,
+	to avoid name conflict with INFINITY from cygwin <math.h>.
+
 2009-05-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* omfonts.c: allow 'omfonts -ofm2opl' to be ofm2opl etc., used
diff --git a/Build/source/texk/web2c/omegafonts/dimen_routines.c b/Build/source/texk/web2c/omegafonts/dimen_routines.c
index a4f5a1360ab..94ec26ce492 100644
--- a/Build/source/texk/web2c/omegafonts/dimen_routines.c
+++ b/Build/source/texk/web2c/omegafonts/dimen_routines.c
@@ -62,7 +62,7 @@ init_measures(void)
 {
     register int i;
     for (i=C_MIN; i<=C_MAX; i++) {
-        measure_list[i] = in_list1(INFINITY, NULL);
+        measure_list[i] = in_list1(WEB_INFINITY, NULL);
         measure_max[i] = 0;
     }
 }
@@ -142,8 +142,8 @@ min_cover(int h, int d)
     int m=0; /* the current size of the cover being generated */
     int l;   /* the least element covered by the current interval */
 
-    m = 0; next_d = INFINITY;
-    while (lval(L) != INFINITY) {
+    m = 0; next_d = WEB_INFINITY;
+    while (lval(L) != WEB_INFINITY) {
         m++; l = lval(L);
         while (lval(L->ptr) <= (l+d)) L = L->ptr;
 	L = L->ptr;
@@ -191,7 +191,7 @@ set_indices(int h, int d)
 
 /* How to store the information for each character ? */
     L1 = measure_list[h]; m = 0;
-    while (lval(L1) != INFINITY) {
+    while (lval(L1) != WEB_INFINITY) {
         L2 = L1;
         m++; l = lval(L1); 
 	L1->index = m;
@@ -236,7 +236,7 @@ build_dimen_tables(void)
             dimen_tables[i] = (int *) malloc((measure_max[i]+1)*sizeof(int));
             L1 = measure_list[i];
             j=0;
-            while (lval(L1) != INFINITY) {
+            while (lval(L1) != WEB_INFINITY) {
                 L1 = L1->actual;
                 dimen_tables[i][j] = lval(L1);
                 L1 = L1->ptr;
diff --git a/Build/source/texk/web2c/omegafonts/manifests.h b/Build/source/texk/web2c/omegafonts/manifests.h
index 94a1a80141c..b44981998a0 100644
--- a/Build/source/texk/web2c/omegafonts/manifests.h
+++ b/Build/source/texk/web2c/omegafonts/manifests.h
@@ -245,7 +245,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
 
 
 #define UNITY     0x100000
-#define INFINITY  0x7fffffff
+#define WEB_INFINITY  0x7fffffff
 
 #define LEN_CODING_SCHEME  39
 #define LEN_FAMILY         19