From d48840293d264a628b2432cac087c33012c069da Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 19 Oct 2012 06:36:42 +0000 Subject: pdfTeX: Remove all TL vs W32TeX diffs (from Akira) git-svn-id: svn://tug.org/texlive/trunk@28028 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/pdftexdir/pdftoepdf.cc | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'Build/source/texk/web2c') 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 + + * pdftoepdf.cc: In MSVC 5.0 getNewObjectNumber() requires an int + return value. + 2012-10-18 Peter Breitenlohner * pdftoepdf.cc: #include 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 *); -- cgit v1.2.3