diff options
author | Joachim Schrod <jschrod@acm.org> | 2008-02-17 12:58:17 +0000 |
---|---|---|
committer | Joachim Schrod <jschrod@acm.org> | 2008-02-17 12:58:17 +0000 |
commit | 6e6be95c64689979c542c342d71b57d77038d7aa (patch) | |
tree | 1d67cc2ea8de96c9d4cbdedab56fc75a1a71c9d3 /Build/source/texk/dviljk | |
parent | 20e9169c43c38fbfdf6e42e45bef825ccd7d392d (diff) |
cc of Sun Studio 11 is picky and wants clauses in conditional
expressions to have the same type, cast multi-bytes() to void.
(Reported by Vladimir Volovich <vvv@vsu.ru> at 16 Feb 08.)
git-svn-id: svn://tug.org/texlive/trunk@6657 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dviljk')
-rw-r--r-- | Build/source/texk/dviljk/dvi2xx.c | 17 | ||||
-rw-r--r-- | Build/source/texk/dviljk/dvi2xx.h | 2 |
2 files changed, 3 insertions, 16 deletions
diff --git a/Build/source/texk/dviljk/dvi2xx.c b/Build/source/texk/dviljk/dvi2xx.c index e009df63afb..f54c5058740 100644 --- a/Build/source/texk/dviljk/dvi2xx.c +++ b/Build/source/texk/dviljk/dvi2xx.c @@ -1097,18 +1097,6 @@ CloseFiles() } } -/*-->GetBytes*/ -/**********************************************************************/ -/***************************** GetBytes *****************************/ -/**********************************************************************/ -/* get n bytes from file fp; now a macro, so we don't need it any more -void -GetBytes(FILEPTR fp, char *cp, int n) -{ - read_multi(cp,n,1,fp); -} -*/ - /*-->NoSignExtend*/ /**********************************************************************/ /*************************** NoSignExtend ***************************/ @@ -4223,9 +4211,8 @@ int n; /* We cannot use mkstemp, as we cannot pass two open file descriptors portably to Ghostscript. We don't want to use tmpnam() or tempnam() either, as they have tempfile creation race conditions. Instead we - create a temporary directory with mkdtemp() -- if that's available. - If not, we are thrown back to tempnam(), to get our functionality - at all. We need to create the temporary directory only once per + create a temporary directory with mkdtemp(). + We need to create the temporary directory only once per run; it will be deleted in AllDone(). */ if ( tmp_dir[0] == '\0' ) { char * base_dir; diff --git a/Build/source/texk/dviljk/dvi2xx.h b/Build/source/texk/dviljk/dvi2xx.h index 80396410f7f..ff443ea3ba5 100644 --- a/Build/source/texk/dviljk/dvi2xx.h +++ b/Build/source/texk/dviljk/dvi2xx.h @@ -287,7 +287,7 @@ char *MFMODE = MFMODE600; write a new one. [27 Jun 07 -js] */ #define GetBytes(fp,buf,n) \ ( sizeof(buf) != sizeof(void *) && sizeof(buf) > n ? \ - read_multi(buf, 1, n, fp) \ + (void)read_multi(buf, 1, n, fp) \ : Fatal("Try to read %d bytes in an array of size %d", n, sizeof(buf)) ) |