summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-15 07:09:59 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-15 07:09:59 +0000
commit7813f69d31d5f32bc397d7586de6a41f67631f5f (patch)
tree1a3a663730f1fc037b13b2137096b36a5625fe10 /Build
parent15a3c5c0dc3253647bbf40b2826fbbbb8474fab3 (diff)
texk/dvipsk: Avoid conflicting names
git-svn-id: svn://tug.org/texlive/trunk@34616 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipsk/ChangeLog5
-rw-r--r--Build/source/texk/dvipsk/t1part.c16
-rw-r--r--Build/source/texk/dvipsk/t1part.h4
3 files changed, 15 insertions, 10 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index f48fa8e99a3..560516ec084 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * t1part.c, t1part.h: Rename _HUGE => BORLAND_HUGE to avoid
+ conflicting names.
+
2014-06-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* afm2tfm.c, dospecial.c, emspecial.c, resident.c, writet1.c:
diff --git a/Build/source/texk/dvipsk/t1part.c b/Build/source/texk/dvipsk/t1part.c
index 86a7035c8dd..9d43e22c2cd 100644
--- a/Build/source/texk/dvipsk/t1part.c
+++ b/Build/source/texk/dvipsk/t1part.c
@@ -176,9 +176,9 @@ def_ref refer[10];
#define POP 17
#define SETCURRENTPOINT 33
-typetemp _HUGE *temp;
-typetemp _HUGE *begin_of_scan;
-typetemp _HUGE *end_of_scan;
+typetemp BORLAND_HUGE *temp;
+typetemp BORLAND_HUGE *begin_of_scan;
+typetemp BORLAND_HUGE *end_of_scan;
unsigned char *line;
unsigned char *tmpline;
unsigned char token[64];
@@ -244,7 +244,7 @@ static char Dup[]="dup";
typedef struct
{
- typetemp _HUGE *begin;
+ typetemp BORLAND_HUGE *begin;
int length;
int type;
int offset;
@@ -276,7 +276,7 @@ type_key Key[] =
struct def_label
{
- typetemp _HUGE *begin;
+ typetemp BORLAND_HUGE *begin;
unsigned char skip;
int length;
short select;
@@ -1051,8 +1051,8 @@ DeCodeStr(int num, int numseac)
int depth = 0;
int num_err = 0;
int len_str;
- typetemp _HUGE *loc;
- typetemp _HUGE *end_str;
+ typetemp BORLAND_HUGE *loc;
+ typetemp BORLAND_HUGE *end_str;
int pstack[64];
int last_subr;
@@ -1323,7 +1323,7 @@ ScanChars(int i)
int max_num;
int counter;
int num_err = 0;
- typetemp _HUGE *tmptemp;
+ typetemp BORLAND_HUGE *tmptemp;
CharCount++;
diff --git a/Build/source/texk/dvipsk/t1part.h b/Build/source/texk/dvipsk/t1part.h
index ef4ebe728a7..57b8be01c0f 100644
--- a/Build/source/texk/dvipsk/t1part.h
+++ b/Build/source/texk/dvipsk/t1part.h
@@ -64,10 +64,10 @@ typedef unsigned long int ub4;
#ifdef BORLANDC
typedef unsigned char typetemp;
-#define _HUGE huge
+#define BORLAND_HUGE huge
#else
typedef unsigned char typetemp;
-#define _HUGE
+#define BORLAND_HUGE
#endif
#ifdef BORLANDC