diff options
| author | Karl Berry <karl@freefriends.org> | 2006-12-10 19:50:27 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2006-12-10 19:50:27 +0000 |
| commit | e8b52b47ee619767f576cefa4f4676363c3343d5 (patch) | |
| tree | 49685b7a897bbfb206b333e817c9bbce5e858c54 | |
| parent | e81974badf2eb5f87919eae288ab85453fefa283 (diff) | |
avoid int8 name collision
git-svn-id: svn://tug.org/texlive/trunk@2673 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/omegaware/odvicopy.ch | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index fb32c6e8f25..af919eac642 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2006-12-10 Karl Berry <karl@tug.org> + + * omegaware/odvicopy.ch (int_8): rename the type to int_8_odvicopy, + and @d int_8 itself to that, so that we don't end up with int8 in + the C file. AIX inttypes.h declares that. (Reported by vvv.) + 2006-09-05 Karl Berry <karl@tug.org> * bibtex.ch (BUF_SIZE): increase to 20000 per Lee Samuel Finn, via diff --git a/Build/source/texk/web2c/omegaware/odvicopy.ch b/Build/source/texk/web2c/omegaware/odvicopy.ch index fa490c7b857..b52b774ab0e 100644 --- a/Build/source/texk/web2c/omegaware/odvicopy.ch +++ b/Build/source/texk/web2c/omegaware/odvicopy.ch @@ -3,6 +3,7 @@ % This file is part of the Omega project, which % is based in the web2c distribution of TeX. % +% Copyright 2006 Karl Berry (to fix int_8 for AIX). % Copyright (c) 1994--1998 John Plaice and Yannis Haralambous % applies only to the changes to the original dvicopy.ch. % @@ -64,6 +65,21 @@ procedure initialize; {this procedure gets things started properly} line of input from the terminal} @z +% int_8 conflicts with <sys/inttypes.h> on AIX. +% It just gets turned into schar anyway, so use that. +@x +@d int_32 == integer {signed 32~bit integers} +@y +@d int_32 == integer {signed 32~bit integers} +@d int_8 == int_8_odvicopy {avoid C declaration collision on AIX} +@z +% +@x +@!int_8 = -@"80..@"7F; {signed 8~bit integer} +@y +@!int_8_odvicopy = -@"80..@"7F; {signed 8~bit integer} +@z + % [14] Redirect output, so it can go to either stdout or stderr, % depending on where the output dvi file is going. @x |