diff options
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 10 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/image/epdf.h | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/luatex.h | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/ptexlib.h | 2 |
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 |