diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-10-19 06:36:42 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-10-19 06:36:42 +0000 |
commit | d48840293d264a628b2432cac087c33012c069da (patch) | |
tree | 292307d790ea4b5148382f23847983523e858023 | |
parent | 7c924505176ecb074284b0d4bc0679f8dd61ca0d (diff) |
pdfTeX: Remove all TL vs W32TeX diffs (from Akira)
git-svn-id: svn://tug.org/texlive/trunk@28028 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/pdftoepdf.cc | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 47fadaeed09..9796ed68ad1 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-10-19 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * pdftoepdf.cc: In MSVC 5.0 getNewObjectNumber() requires an int + return value. + 2012-10-18 Peter Breitenlohner <peb@mppmu.mpg.de> * pdftoepdf.cc: #include <w2c/config.h> early to avoid problems diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc index b291cd58bef..fca7a711434 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc +++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc @@ -285,6 +285,11 @@ static int getNewObjectNumber(Ref ref) } pdftex_fail("Object not yet copied: %i %i", ref.num, ref.gen); } +#ifdef _MSC_VER + /* Never reached, but without __attribute__((noreturn)) for pdftex_fail() + MSVC 5.0 requires an int return value. */ + return -60000; +#endif } static void copyObject(Object *); |