diff options
Diffstat (limited to 'Build/source/texk/web2c/omegafonts')
-rw-r--r-- | Build/source/texk/web2c/omegafonts/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/dimen_routines.c | 10 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/manifests.h | 2 |
3 files changed, 11 insertions, 6 deletions
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 |