summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-12-12 11:52:28 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-12-12 11:52:28 +0000
commit108b992203f90ee5bd49c08a38796251d609754d (patch)
tree195c4db7506cd985752edbee9fe90d3d5aed519a
parent4f70153f091e9eaaebd6c8edd5ce74da33a99afb (diff)
LuaTeX: Avoid implicit function declarations
git-svn-id: svn://tug.org/texlive/trunk@35798 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/Makefile.in6
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luafontforge.am3
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luamisc.am1
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/liolibext.c7
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lnodelib.c4
-rw-r--r--Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c1
-rw-r--r--Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c4
-rw-r--r--Build/source/texk/web2c/luatexdir/slnunicode/slnunico.c4
9 files changed, 35 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 5ec31b79291..f92fc332f14 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2998,7 +2998,8 @@ libluasocket_sources = \
libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a
libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_INCLUDES)
-libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUAJIT_INCLUDES)
+libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
+ $(LUAJIT_INCLUDES) -DLuajitTeX -I$(srcdir)/luatexdir
libluamisc_a_CFLAGS = # $(WARNING_CFLAGS)
libluajitmisc_a_CFLAGS = # $(WARNING_CFLAGS)
nodist_libluamisc_a_SOURCES = $(libluamisc_sources)
@@ -3057,12 +3058,13 @@ libjitff_a_DEPENDENCIES = libunilib.a libluajitmisc.a
libff_a_postflags = -DLUA_FF_LIB=1 -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 \
-DUSE_OUR_MEMORY=1 \
-I$(top_srcdir)/w2c \
+ -I$(top_srcdir)/luatexdir \
-I$(top_srcdir)/luatexdir/unilib \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
libff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(libff_a_postflags)
-libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) $(libff_a_postflags)
+libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DLuajitTeX $(libff_a_postflags)
libff_a_CFLAGS = # $(WARNING_CFLAGS)
libjitff_a_CFLAGS = # $(WARNING_CFLAGS)
nodist_libff_a_SOURCES = $(libff_sources)
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 16350bc3d84..ecf25ff2947 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,14 @@
+2014-12-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Avoid implicit function declarations.
+ * am/luafontforge.am (libjitff_a_CPPFLAGS): Add -DLuajitTeX.
+ * am/luamisc.am (libluajitmisc_a_CPPFLAGS: Add -DLuajitTeX.
+ * lua/liolibext.c, lua/lnodelib.c, luafontloader/src/luafflib.c,
+ slnunicode/slnunico.c: Include lauxlib_bridge.h for LuaJITTeX or
+ lauxlib.h for LuaTeX.
+ * luafontloader/fontforge/fontforge/fontviewbase.c:
+ Include gfile.h.
+
2014-12-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Sync with https://foundry.supelec.fr/svn/luatex/trunk/source/
diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
index 483745db253..e629ca20061 100644
--- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am
+++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
@@ -16,12 +16,13 @@ $(libjitff_a_OBJECTS): $(libjitff_a_DEPENDENCIES)
libff_a_postflags = -DLUA_FF_LIB=1 -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 \
-DUSE_OUR_MEMORY=1 \
-I$(top_srcdir)/w2c \
+ -I$(top_srcdir)/luatexdir \
-I$(top_srcdir)/luatexdir/unilib \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
libff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(libff_a_postflags)
-libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) $(libff_a_postflags)
+libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DLuajitTeX $(libff_a_postflags)
libff_a_CFLAGS = # $(WARNING_CFLAGS)
libjitff_a_CFLAGS = # $(WARNING_CFLAGS)
diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am
index 42f01cc5b98..35fd29f9af8 100644
--- a/Build/source/texk/web2c/luatexdir/am/luamisc.am
+++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am
@@ -16,6 +16,7 @@ $(libluajitmisc_a_OBJECTS): $(libluajitmisc_a_DEPENDENCIES)
libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_INCLUDES)
libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUAJIT_INCLUDES)
+libluajitmisc_a_CPPFLAGS += -DLuajitTeX -I$(srcdir)/luatexdir
libluamisc_a_CFLAGS = # $(WARNING_CFLAGS)
libluajitmisc_a_CFLAGS = # $(WARNING_CFLAGS)
diff --git a/Build/source/texk/web2c/luatexdir/lua/liolibext.c b/Build/source/texk/web2c/luatexdir/lua/liolibext.c
index bdcbc7ce2e0..9570c466aa6 100644
--- a/Build/source/texk/web2c/luatexdir/lua/liolibext.c
+++ b/Build/source/texk/web2c/luatexdir/lua/liolibext.c
@@ -26,12 +26,13 @@
#include "ptexlib.h"
#include "lua/luatex-api.h"
-#include "lauxlib.h"
-#include "lualib.h"
#ifdef LuajitTeX
-#include "lauxlib_bridge.h"
+#include "lua/lauxlib_bridge.h"
+#else
+#include "lauxlib.h"
#endif
+#include "lualib.h"
static const char _svn_version[] =
"$Id: liolibext.c 4781 2014-02-10 11:05:24Z taco $ $URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/lua/liolibext.c $";
diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
index dfe51e26b69..f6d74af2918 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
@@ -101,7 +101,11 @@ static const char _svn_version[] =
#include "ptexlib.h"
#include "lua/luatex-api.h"
+#ifdef LuajitTeX
#include "lua/lauxlib_bridge.h"
+#else
+#include "lauxlib.h"
+#endif
/*
diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
index 52b290e0010..24798ad09ee 100644
--- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
+++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
@@ -32,6 +32,7 @@
#include <chardata.h>
#include <math.h>
#include <unistd.h>
+#include <gfile.h>
static FontViewBase *fv_list=NULL;
diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c b/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
index f8efad26e56..04f05d3384d 100644
--- a/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
+++ b/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
@@ -29,7 +29,11 @@
#include <stdio.h>
#include <lua.h>
+#ifdef LuajitTeX
+#include <lua/lauxlib_bridge.h>
+#else
#include <lauxlib.h>
+#endif
#include <locale.h>
static const char _svn_version[] =
diff --git a/Build/source/texk/web2c/luatexdir/slnunicode/slnunico.c b/Build/source/texk/web2c/luatexdir/slnunicode/slnunico.c
index 6876abd95fd..60ef95baca4 100644
--- a/Build/source/texk/web2c/luatexdir/slnunicode/slnunico.c
+++ b/Build/source/texk/web2c/luatexdir/slnunicode/slnunico.c
@@ -88,7 +88,11 @@ http://www.unicode.org/Public/UNIDATA/PropList.txt
#include "lua.h"
+#ifdef LuajitTeX
+#include "lua/lauxlib_bridge.h"
+#else
#include "lauxlib.h"
+#endif
#include "lualib.h"
#ifndef SLN_UNICODENAME /* unless set it luaconf */