From 654fa41b0ba10cfc74e8f492458f2ddbdd177c57 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 2 Jul 2013 10:44:01 +0000 Subject: LuaTeX: fontloader: Make sure or is always included first git-svn-id: svn://tug.org/texlive/trunk@31066 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/luafontloader/ChangeLog | 8 ++++++++ .../texk/web2c/luatexdir/luafontloader/fontforge/Unicode/char.c | 4 ++-- .../texk/web2c/luatexdir/luafontloader/fontforge/Unicode/memory.c | 2 +- .../web2c/luatexdir/luafontloader/fontforge/Unicode/usprintf.c | 4 ++-- .../web2c/luatexdir/luafontloader/fontforge/Unicode/ustring.c | 2 +- .../texk/web2c/luatexdir/luafontloader/fontforge/gutils/fsys.c | 2 +- .../texk/web2c/luatexdir/luafontloader/fontforge/inc/ustring.h | 2 +- .../texk/web2c/luatexdir/luafontloader/fontforge/inc/utype.h | 2 +- Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c | 8 ++++---- 9 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/ChangeLog b/Build/source/texk/web2c/luatexdir/luafontloader/ChangeLog index 562bf5d6583..9ccbf342395 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/luafontloader/ChangeLog @@ -1,3 +1,11 @@ +2013-07-02 Peter Breitenlohner + + * fontforge/Unicode/char.c, fontforge/Unicode/memory.c, + fontforge/Unicode/usprintf.c, fontforge/Unicode/ustring.c, + fontforge/gutils/fsys.c, fontforge/inc/ustring.h, + fontforge/inc/utype.h, src/luafflib.c: Make sure + or is always included first. + 2011-10-21 Werner Fink * fontforge/fontforge/psread.c (ioescapestopped): Correctly diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/char.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/char.c index b21811db032..6f1c9f97ff8 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/char.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/char.c @@ -24,10 +24,10 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include #include "ustring.h" +#include +#include char *strstart(const char *initial, const char *full) { int ch1, ch2; diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/memory.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/memory.c index e9a45ddc2e0..419736c4068 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/memory.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/memory.c @@ -24,10 +24,10 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "ustring.h" #include #include #include -#include "ustring.h" /* wrappers around standard memory routines so we can trap errors. */ static void default_trap(void) { diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/usprintf.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/usprintf.c index 90ddbad38fe..a57f925a925 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/usprintf.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/usprintf.c @@ -24,10 +24,10 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "utype.h" +#include "ustring.h" #include #include -#include "ustring.h" -#include "utype.h" /* unicode printf. Expect arguments to be given using $ notation */ /* But there's no way I'm going to implement all of printf now. I'll do what I */ diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/ustring.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/ustring.c index e8bb2bd936a..88f31df0fc3 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/ustring.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/Unicode/ustring.c @@ -24,9 +24,9 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "ustring.h" #include "utype.h" +#include long uc_strcmp(const unichar_t *str1,const char *str2) { long ch1, ch2; diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/gutils/fsys.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/gutils/fsys.c index dfad4bd395e..05ce3d46bd8 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/gutils/fsys.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/gutils/fsys.c @@ -25,10 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "ustring.h" #include "fileutil.h" #include "gfile.h" +#include #include #include /* for mkdir */ #include diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/inc/ustring.h b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/inc/ustring.h index bb8d16762c7..5bae9647310 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/inc/ustring.h +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/inc/ustring.h @@ -26,10 +26,10 @@ */ #ifndef _UCHAR_H # define _UCHAR_H +#include #include #include #include -#include #include extern char *copy(const char *); diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/inc/utype.h b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/inc/utype.h index 90726a9fb34..04de79a9c6e 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/inc/utype.h +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/inc/utype.h @@ -3,8 +3,8 @@ /* This file was generated using the program 'makeutype' */ -#include /* Include here so we can control it. If a system header includes it later bad things happen */ #include /* Include here so we can use pre-defined int types to correctly size constant data arrays. */ +#include /* Include here so we can control it. If a system header includes it later bad things happen */ #ifdef tolower # undef tolower #endif diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c b/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c index 8168e56059a..366ed66eb33 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c @@ -23,15 +23,15 @@ * @author Taco Hoekwater */ +#include "pfaedit.h" +#include "ustring.h" +#include "lib/lib.h" /* web2c's lib, for recorder_record_input */ + #include #include #include #include -#include "pfaedit.h" -#include "ustring.h" -#include "lib/lib.h" /* web2c's lib, for recorder_record_input */ - static const char _svn_version[] = "$Id: luafflib.c 4524 2012-12-20 15:38:02Z taco $ " "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c $"; -- cgit v1.2.3