summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-10 09:00:00 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-10 09:00:00 +0000
commit40db78f0cac4b7e67227683a063f4bccfe2f50db (patch)
treecbf16fe7ab6bfec429ebcd7451e2d4cc906c92bb /Build/source
parent9ca480758d9c1627299b19f1cb7419c84b57980f (diff)
luaTeX: Remove all diffs between TL and W32TeX
git-svn-id: svn://tug.org/texlive/trunk@27935 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog10
-rw-r--r--Build/source/texk/web2c/luatexdir/image/epdf.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/ptexlib.h2
4 files changed, 13 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 9375e6ddc08..3504753f824 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,13 @@
+2012-10-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Avoid TL vs W32TeX differences (from Akira).
+ * luatex.h: Include "ptexlib.h" instead of <luatexdir/ptexlib.h>
+ as in all other cases.
+ * ptexlib.h: Use _MSC_VER instead of MSVC.
+ * image/epdf.h: Change arg3 of extern void pdf_begin_obj() from
+ bool to int, as declared and defined in pdf/pdfgen.[hw].
+ FIXME: There should be only one extern declaration in one file.
+
2012-10-09 Peter Breitenlohner <peb@mppmu.mpg.de>
The openbsd compat library is no longer used.
diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.h b/Build/source/texk/web2c/luatexdir/image/epdf.h
index c3e23f404a4..798a2c8e5e2 100644
--- a/Build/source/texk/web2c/luatexdir/image/epdf.h
+++ b/Build/source/texk/web2c/luatexdir/image/epdf.h
@@ -86,7 +86,7 @@ extern "C" {
/* pdfgen.c */
__attribute__ ((format(printf, 2, 3)))
extern void pdf_printf(PDF, const char *fmt, ...);
- extern void pdf_begin_obj(PDF, int, bool);
+ extern void pdf_begin_obj(PDF, int, int);
extern void pdf_end_obj(PDF);
extern void pdf_begin_stream(PDF);
extern void pdf_end_stream(PDF);
diff --git a/Build/source/texk/web2c/luatexdir/luatex.h b/Build/source/texk/web2c/luatexdir/luatex.h
index bb62e8885d3..56163ae7188 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.h
+++ b/Build/source/texk/web2c/luatexdir/luatex.h
@@ -102,7 +102,7 @@ extern void ipcpage(int);
extern boolean input_line(FILE *);
-# include <luatexdir/ptexlib.h>
+# include "ptexlib.h"
# define COPYRIGHT_HOLDER "Taco Hoekwater"
# define AUTHOR NULL
diff --git a/Build/source/texk/web2c/luatexdir/ptexlib.h b/Build/source/texk/web2c/luatexdir/ptexlib.h
index 6169f1b7396..710586a8b8f 100644
--- a/Build/source/texk/web2c/luatexdir/ptexlib.h
+++ b/Build/source/texk/web2c/luatexdir/ptexlib.h
@@ -33,7 +33,7 @@
# include "lib/lib.h"
-# ifdef MSVC
+# ifdef _MSC_VER
extern double rint(double x);
# endif