diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-06-02 13:37:18 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-06-02 13:37:18 +0000 |
| commit | db52a844e2827422ab49d51245fbf295eb999cc4 (patch) | |
| tree | 9008f9ce769eb2cfeb11615859b655815eccc58e /Build/source/texk/ps2pkm | |
| parent | 5a41f1a3e2ac042d63f091824efa2af2bf9912fc (diff) | |
rename INFINITY -> T1_INFINITY to avoid name conflict with INFINITY from cygwin <math.h>
git-svn-id: svn://tug.org/texlive/trunk@13579 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ps2pkm')
| -rw-r--r-- | Build/source/texk/ps2pkm/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/ps2pkm/regions.c | 4 | ||||
| -rw-r--r-- | Build/source/texk/ps2pkm/regions.h | 2 | ||||
| -rw-r--r-- | Build/source/texk/ps2pkm/t1imager.h | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog index 60d874aab36..25f08b5a38c 100644 --- a/Build/source/texk/ps2pkm/ChangeLog +++ b/Build/source/texk/ps2pkm/ChangeLog @@ -1,5 +1,11 @@ 2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + * regions.c, regions.h, t1imager.h: + rename INFINITY -> T1_INFINITY, to avoid name conflict with + INFINITY from cygwin <math.h>. + +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + Adapt to TL2009 build system. 2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/texk/ps2pkm/regions.c b/Build/source/texk/ps2pkm/regions.c index c58800691c5..abe0da5ac6c 100644 --- a/Build/source/texk/ps2pkm/regions.c +++ b/Build/source/texk/ps2pkm/regions.c @@ -142,7 +142,7 @@ set. The flag is used to optimize some paths. /*SHARED LINE(S) ORIGINATED HERE*/ /* -:h4."INFINITY" - A Constant Region Structure of Infinite Extent +:h4."T1_INFINITY" - A Constant Region Structure of Infinite Extent Infinity is the complement of a null area: Note - removed the refcount = 1 init, replaced with references = 2 3-26-91 PNM @@ -154,7 +154,7 @@ static struct region t1_infinity = { REGIONTYPE, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL }; -struct region *INFINITY = &t1_infinity; +struct region *T1_INFINITY = &t1_infinity; /* :h4."EmptyRegion" - A Region Structure with Zero Area diff --git a/Build/source/texk/ps2pkm/regions.h b/Build/source/texk/ps2pkm/regions.h index 2d0e6b7968e..11fb250364c 100644 --- a/Build/source/texk/ps2pkm/regions.h +++ b/Build/source/texk/ps2pkm/regions.h @@ -40,7 +40,7 @@ struct region *t1_Intersect(); /* set intersection of regions */ struct region *t1_Complement(); /* complement of a region */ int t1_Overlap(); /* returns a Boolean; TRUE if regions overlap */ -#define INFINITY t1_Infinity +#define T1_INFINITY t1_Infinity /*END SHARED*/ /*SHARED*/ diff --git a/Build/source/texk/ps2pkm/t1imager.h b/Build/source/texk/ps2pkm/t1imager.h index a8a8e3f609f..78eae98fd7f 100644 --- a/Build/source/texk/ps2pkm/t1imager.h +++ b/Build/source/texk/ps2pkm/t1imager.h @@ -137,9 +137,9 @@ Null path definition: /* Full page and null region definition: */ -#define INFINITY t1_Infinity +#define T1_INFINITY t1_Infinity #ifndef NOEXTERNS -extern region *INFINITY; +extern region *T1_INFINITY; #endif #ifdef NULLREGION #undef NULLREGION |