summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-01-27 16:56:37 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-01-27 16:56:37 +0000
commit3c5ac79bdcccdc1fe40ca8ff4794ce407f5bae07 (patch)
treea72f4f8afabb291663514cedb99a4057a9c338d6 /Build
parent1e1056c00f803f0b6c5804edc0b1e488cfc38cdb (diff)
compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@16845 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/utils/avl.c8
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/pdftexdir/avl.c8
4 files changed, 16 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index c822b1e3167..21f87b6305f 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,5 +1,9 @@
2010-01-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+ * utils/avl.c (avl_copy): Proper handling of const.
+
+2010-01-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
* luafontloader/src/luafflib.h: New file with prototypes used
by libluatex.
* luafontloader/src/luafflib.c: #include "luafflib.h".
diff --git a/Build/source/texk/web2c/luatexdir/utils/avl.c b/Build/source/texk/web2c/luatexdir/utils/avl.c
index 0241ebd3e6b..0c322f12071 100644
--- a/Build/source/texk/web2c/luatexdir/utils/avl.c
+++ b/Build/source/texk/web2c/luatexdir/utils/avl.c
@@ -658,8 +658,7 @@ struct avl_table *avl_copy(const struct avl_table *org, avl_copy_func * copy,
int height = 0;
struct avl_table *new;
- const struct avl_node *x;
- struct avl_node *y;
+ struct avl_node org_head, *x, *y;
assert(org != NULL);
new = avl_create(org->avl_compare, org->avl_param,
@@ -670,7 +669,8 @@ struct avl_table *avl_copy(const struct avl_table *org, avl_copy_func * copy,
if (new->avl_count == 0)
return new;
- x = (const struct avl_node *) &org->avl_root;
+ org_head.avl_link[0] = (struct avl_node *) org->avl_root;
+ x = &org_head;
y = (struct avl_node *) &new->avl_root;
for (;;) {
while (x->avl_link[0] != NULL) {
@@ -689,7 +689,7 @@ struct avl_table *avl_copy(const struct avl_table *org, avl_copy_func * copy,
return NULL;
}
- stack[height++] = (struct avl_node *) x;
+ stack[height++] = x;
stack[height++] = y;
x = x->avl_link[0];
y = y->avl_link[0];
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 26e327442da..1730f863d95 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * avl.c (avl_copy): Proper handling of const.
+
2010-01-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/libpdftex.am (libpdftex_a_CFLAGS): Enable compiler warnings.
diff --git a/Build/source/texk/web2c/pdftexdir/avl.c b/Build/source/texk/web2c/pdftexdir/avl.c
index 0241ebd3e6b..0c322f12071 100644
--- a/Build/source/texk/web2c/pdftexdir/avl.c
+++ b/Build/source/texk/web2c/pdftexdir/avl.c
@@ -658,8 +658,7 @@ struct avl_table *avl_copy(const struct avl_table *org, avl_copy_func * copy,
int height = 0;
struct avl_table *new;
- const struct avl_node *x;
- struct avl_node *y;
+ struct avl_node org_head, *x, *y;
assert(org != NULL);
new = avl_create(org->avl_compare, org->avl_param,
@@ -670,7 +669,8 @@ struct avl_table *avl_copy(const struct avl_table *org, avl_copy_func * copy,
if (new->avl_count == 0)
return new;
- x = (const struct avl_node *) &org->avl_root;
+ org_head.avl_link[0] = (struct avl_node *) org->avl_root;
+ x = &org_head;
y = (struct avl_node *) &new->avl_root;
for (;;) {
while (x->avl_link[0] != NULL) {
@@ -689,7 +689,7 @@ struct avl_table *avl_copy(const struct avl_table *org, avl_copy_func * copy,
return NULL;
}
- stack[height++] = (struct avl_node *) x;
+ stack[height++] = x;
stack[height++] = y;
x = x->avl_link[0];
y = y->avl_link[0];