From 07bf7b9c954d96cff26691380ae814e33e298cb7 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 2 Aug 2012 09:02:15 +0000 Subject: detex, dviljk: Rename Foo -> my_Foo to avoid name conflict (from W32TeX) git-svn-id: svn://tug.org/texlive/trunk@27286 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dviljk/ChangeLog | 6 ++++++ Build/source/texk/dviljk/dvi2xx.c | 27 +++++++++++++-------------- Build/source/texk/dviljk/dvi2xx.h | 8 ++------ 3 files changed, 21 insertions(+), 20 deletions(-) (limited to 'Build/source/texk/dviljk') diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog index 76df090f945..cf9b9d8ccce 100644 --- a/Build/source/texk/dviljk/ChangeLog +++ b/Build/source/texk/dviljk/ChangeLog @@ -1,3 +1,9 @@ +2012-08-02 Peter Breitenlohner + + * dvi2xx.[ch]: Rename CopyFile -> my_CopyFile, ResetPrinter -> + my_ResetPrinter, and PATTERN -> my_PATTERN to avoid a conflict + with WIN32 headers (from W32TeX). + 2011-05-30 Peter Breitenlohner * doc/Makefile.am: Use ../am/bin_links.am for $(bindir) links. diff --git a/Build/source/texk/dviljk/dvi2xx.c b/Build/source/texk/dviljk/dvi2xx.c index 7a34413aad6..03c473fa8de 100644 --- a/Build/source/texk/dviljk/dvi2xx.c +++ b/Build/source/texk/dviljk/dvi2xx.c @@ -246,11 +246,11 @@ main(int argc, char *argv[]) /* it is important that these be the very first things output !!! */ if ( G_header ) - CopyFile( HeaderFileName ); + my_CopyFile( HeaderFileName ); /*****************************/ /*for( i0=0; i0CopyFile*/ /* copy a file straight through to output */ +/*-->my_CopyFile*/ /* copy a file straight through to output */ /*********************************************************************/ -/***************************** CopyFile ******************************/ +/***************************** my_CopyFile ***************************/ /*********************************************************************/ void -CopyFile(const char *str ) +my_CopyFile(const char *str ) { FILEPTR spfp; int todo; @@ -2911,7 +2911,7 @@ Primary author of Dvi2xx: Gustaf Neumann; -k maintainer: K. Berry."); break; #ifdef LJ case 'g': /* do not reset printer (go) */ - ResetPrinter = _FALSE; + my_ResetPrinter = _FALSE; break; #endif case 'h': /* copy header file through to output */ @@ -3526,14 +3526,13 @@ void AllDone(bool PFlag) /***************************** DoSpecial ***************************/ /*********************************************************************/ -#define PATTERN LJPATTERN typedef enum { ORIENTATION, RESETPOINTS, DEFPOINT, FILL, GRAY, - PATTERN, + my_PATTERN, COMMENT, HPFILE, HPFILE_VERBATIM, @@ -3554,7 +3553,7 @@ KeyDesc KeyTab[] = { { FILL, "fill", String}, { GRAY, "gray", Integer}, { GRAY, "grey", Integer}, - { PATTERN, "pattern", Integer}, + { my_PATTERN, "pattern", Integer}, { COMMENT, "comment", String}, { HPFILE, "hpfile", String}, { HPFILE_VERBATIM, "hpfile-verbatim", String}, @@ -3876,7 +3875,7 @@ void DoSpecial(char *str, int n) } break; - case PATTERN: + case my_PATTERN: if ((k.v.i >= 0) && (k.v.i < 7)) { Pattern = k.v.i; GrayFill = _FALSE; @@ -4108,7 +4107,7 @@ void DoSpecial(char *str, int n) if ( file_type == HPFile ) CopyHPFile( include_file ); else if ( file_type == VerbFile ) - CopyFile( include_file ); + my_CopyFile( include_file ); else if ( file_type == None ) /* do nothing */ ; else diff --git a/Build/source/texk/dviljk/dvi2xx.h b/Build/source/texk/dviljk/dvi2xx.h index cb65e8f5ec7..3e1c45228f0 100644 --- a/Build/source/texk/dviljk/dvi2xx.h +++ b/Build/source/texk/dviljk/dvi2xx.h @@ -329,10 +329,6 @@ int intdos(); #include #include #include -#undef CopyFile -#define CopyFile LJCopyFile -#undef ResetPrinter -#define ResetPrinter LJResetPrinter #endif #ifndef USEPXL @@ -457,7 +453,7 @@ void AllDone(bool); void AssureBinary(FILEPTR); /* DOS and Microsoft C dependent !!! */ #endif void CloseFiles(void); -void CopyFile(const char *); +void my_CopyFile(const char *); void CopyHPFile(char *); void DecodeArgs(int, char *[]); #ifdef __riscos @@ -535,7 +531,7 @@ bool FirstAlternate = _FALSE; /* first page from alternate casette ? */ #endif bool Reverse = _FALSE; /* process DVI pages in reverse order? */ bool Landscape = _FALSE; /* print document in ladscape mode */ -bool ResetPrinter = _TRUE; /* reset printer at the begin of the job */ +bool my_ResetPrinter = _TRUE; /* reset printer at the begin of the job */ bool DoublePage = _FALSE; /* print on both sides of a paper */ bool PrintSecondPart = _TRUE; /* print First Part when DoublePage */ bool PrintFirstPart = _TRUE; /* print Second Part when DoublePage */ -- cgit v1.2.3