summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvik
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/xdvik')
-rw-r--r--Build/source/texk/xdvik/ChangeLog.TL5
-rw-r--r--Build/source/texk/xdvik/tests/run_tests.c14
-rw-r--r--Build/source/texk/xdvik/tests/test_dl_list.c2
3 files changed, 13 insertions, 8 deletions
diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index 63f1b4ef20f..811c89545f5 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,11 @@
ChangeLog.TL: Changes for xdvik (TeX Live)
==================================================
+2010-05-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tests/run_tests.c, test_dl_list.c: Cast size_t to long for
+ printing to avoid warnings on 64Bit systems.
+
2010-03-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Remove AC_TYPE_SIZE_T, now part of KPSE_COMMON.
diff --git a/Build/source/texk/xdvik/tests/run_tests.c b/Build/source/texk/xdvik/tests/run_tests.c
index 5235b9b5b2c..f4d672aa0bc 100644
--- a/Build/source/texk/xdvik/tests/run_tests.c
+++ b/Build/source/texk/xdvik/tests/run_tests.c
@@ -31,7 +31,7 @@ test_str_list_equality(int verbosity, char **str_list1, char **str_list2)
if (str_list1[i] == NULL || str_list2[i] == NULL) {
if (verbosity) {
- ERROR((stderr, "Items %d differ: |%s| != |%s|\n", i, str_list1[i], str_list2[i]));
+ ERROR((stderr, "Items %ld differ: |%s| != |%s|\n", (long) i, str_list1[i], str_list2[i]));
}
return False;
}
@@ -39,12 +39,12 @@ test_str_list_equality(int verbosity, char **str_list1, char **str_list2)
res = strcmp(str_list1[i], str_list2[i]);
if (res != 0) {
if (verbosity) {
- ERROR((stderr, "Items %d differ: |%s| != |%s|\n", i, str_list1[i], str_list2[i]));
+ ERROR((stderr, "Items %ld differ: |%s| != |%s|\n", (long) i, str_list1[i], str_list2[i]));
}
return False;
}
else if (verbosity) {
- INFO((stderr, "Items %d equal: |%s| == |%s|\n", i, str_list1[i], str_list2[i]));
+ INFO((stderr, "Items %ld equal: |%s| == |%s|\n", (long) i, str_list1[i], str_list2[i]));
}
}
return True;
@@ -78,7 +78,7 @@ run_all_tests(int verbosity)
int tests_failed = 0;
int tests_ok = 0;
- fprintf(stdout, "\nGoing to run %d tests ...\n", m_test_proc_size);
+ fprintf(stdout, "\nGoing to run %ld tests ...\n", (long) m_test_proc_size);
for (i = 0; i < m_test_proc_size; i++) {
Boolean retval = m_test_proc_list[i].proc(verbosity);
@@ -89,9 +89,9 @@ run_all_tests(int verbosity)
else {
tests_ok++;
}
- fprintf(stdout, "%sTest %d: %s (%s)\n",
+ fprintf(stdout, "%sTest %ld: %s (%s)\n",
retval ? "" : "*****",
- i + 1,
+ (long) i + 1,
retval ? "OK" : "FAILURE",
m_test_proc_list[i].name);
}
@@ -102,7 +102,7 @@ run_all_tests(int verbosity)
return True;
}
else {
- fprintf(stdout, "Darn, %d of %d tests failed!\n\n", tests_failed, m_test_proc_size);
+ fprintf(stdout, "Darn, %d of %ld tests failed!\n\n", tests_failed, (long) m_test_proc_size);
return False;
}
}
diff --git a/Build/source/texk/xdvik/tests/test_dl_list.c b/Build/source/texk/xdvik/tests/test_dl_list.c
index a929b76ef6c..2ebc7409493 100644
--- a/Build/source/texk/xdvik/tests/test_dl_list.c
+++ b/Build/source/texk/xdvik/tests/test_dl_list.c
@@ -34,7 +34,7 @@ static Boolean test_equality(int verbose,
if (list_len != elem_cnt) {
if (verbose) {
- ERROR((stderr, "List len %d != %d\n", list_len, elem_cnt));
+ ERROR((stderr, "List len %ld != %ld\n", (long) list_len, (long) elem_cnt));
}
return False;
}