diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2010-04-13 10:01:03 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2010-04-13 10:01:03 +0000 |
commit | 27cb85d417e47314739f93914e08da7ff8608bed (patch) | |
tree | ca94d101f3dc61de75b746901733862c33c197bc /Build/source/texk/web2c/mplibdir | |
parent | 677b8b6ff1ec8b35713c4764d191a814fbb8aeb2 (diff) |
new luatex and mplib from the luatex repository
git-svn-id: svn://tug.org/texlive/trunk@17836 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mplibdir')
-rw-r--r-- | Build/source/texk/web2c/mplibdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/mplibdir/avl.c | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/mplibdir/avl.h | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/mplibdir/lmplib.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index b4df789b05d..bd380296d63 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,7 @@ +2010-04-13 Taco Hoekwater <taco@luatex> + + * new import from luatex repository (HEAD of 0.60.x branch) + 2010-04-05 Karl Berry <karl@tug.org> * mptrap.test: use --mem, not --memname (which does not exist). diff --git a/Build/source/texk/web2c/mplibdir/avl.c b/Build/source/texk/web2c/mplibdir/avl.c index 4d05baacb4e..1062de9d568 100644 --- a/Build/source/texk/web2c/mplibdir/avl.c +++ b/Build/source/texk/web2c/mplibdir/avl.c @@ -11,10 +11,10 @@ #define AVL_SHOW_ERROR(fmt,arg) (void) (fmt), (void) (arg) #endif -void * +const void * avl_default_item_copy (const void *item) { - return (void *) item; + return item; } void * @@ -767,7 +767,7 @@ rebalance_del (avl_node * p, avl_tree t, void **backup) { avl_node **r, *a, *c; int dir, bal; - + dir = 0; /* for -W */ a = p->up; if (a == NULL) r = &t->root; @@ -1256,7 +1256,7 @@ avl_ins (void *item, avl_tree t, avl_bool_t allow_duplicates) avl_compare_func cmp = t->compare; avl_node **r, *a; int dir; - + dir = 0; /* for -W */ for (r = &t->root, a = NULL; *r != NULL; r = &a->sub[dir = dir > 0]) { a = *r; diff --git a/Build/source/texk/web2c/mplibdir/avl.h b/Build/source/texk/web2c/mplibdir/avl.h index d5d2ada72d3..9771c095220 100644 --- a/Build/source/texk/web2c/mplibdir/avl.h +++ b/Build/source/texk/web2c/mplibdir/avl.h @@ -62,7 +62,7 @@ extern avl_code_t avl_errcmp_occurred(void *); /* At minimum, shallow copy */ -void *avl_default_item_copy(const void *); +const void *avl_default_item_copy(const void *); void *avl_default_item_dispose(void *); #define AVL_STACK_CAPACITY 32 /* for avl_split() function */ diff --git a/Build/source/texk/web2c/mplibdir/lmplib.c b/Build/source/texk/web2c/mplibdir/lmplib.c index 5d7fd8c6478..41b59a4e87f 100644 --- a/Build/source/texk/web2c/mplibdir/lmplib.c +++ b/Build/source/texk/web2c/mplibdir/lmplib.c @@ -40,6 +40,8 @@ /*@unused@*/ static const char _svn_version[] = "$Id: lmplib.c 1364 2008-07-04 16:09:46Z taco $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/src/texk/web2c/luatexdir/lua/lmplib.c $"; +int luaopen_mplib(lua_State * L); /* forward */ + /* metatable identifiers and tests */ #define MPLIB_METATABLE "MPlib" |