From 5c1d6626f49b98d02b3184afe4fd42e65a56e7d4 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 16 Apr 2013 13:05:08 +0000 Subject: makeindexk: Avoid gcc warning on 64-bit systems git-svn-id: svn://tug.org/texlive/trunk@29973 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/makeindexk/ChangeLog | 6 ++++++ Build/source/texk/makeindexk/mkind.c | 2 +- Build/source/texk/makeindexk/mkind.h | 2 +- Build/source/texk/makeindexk/sortid.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'Build/source/texk/makeindexk') diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog index 21cf05f2f04..7581a9ae3b1 100644 --- a/Build/source/texk/makeindexk/ChangeLog +++ b/Build/source/texk/makeindexk/ChangeLog @@ -1,3 +1,9 @@ +2013-04-16 Peter Breitenlohner + + Avoid gcc warning on 64-bit systems. + * mkind.[ch] (idx_gt): Change type 'size_t' back to 'int'. + * sortid.c (sort_idx): Cast qqsort() arg2 idx_gt to 'size_t'. + 2012-11-19 Peter Breitenlohner * Makefile.am: Avoid use of deprecated INCLUDES. diff --git a/Build/source/texk/makeindexk/mkind.c b/Build/source/texk/makeindexk/mkind.c index 838afc3ca39..bf9c33c24a7 100644 --- a/Build/source/texk/makeindexk/mkind.c +++ b/Build/source/texk/makeindexk/mkind.c @@ -43,7 +43,7 @@ int idx_dot = TRUE; /* flag which shows dot in ilg being * active */ int idx_tt = 0; /* total entry count (all files) */ int idx_et = 0; /* erroneous entry count (all files) */ -size_t idx_gt = 0; /* good entry count (all files) */ +int idx_gt = 0; /* good entry count (all files) */ FIELD_PTR *idx_key; FILE *log_fp; diff --git a/Build/source/texk/makeindexk/mkind.h b/Build/source/texk/makeindexk/mkind.h index dab51a20893..cc58b680dd9 100644 --- a/Build/source/texk/makeindexk/mkind.h +++ b/Build/source/texk/makeindexk/mkind.h @@ -506,7 +506,7 @@ extern NODE_PTR tail; extern int idx_dot; extern int idx_tt; -extern size_t idx_gt; +extern int idx_gt; extern int idx_et; extern int idx_dc; diff --git a/Build/source/texk/makeindexk/sortid.c b/Build/source/texk/makeindexk/sortid.c index 2a62d694864..8d8e6576576 100644 --- a/Build/source/texk/makeindexk/sortid.c +++ b/Build/source/texk/makeindexk/sortid.c @@ -56,7 +56,7 @@ sort_idx(void) #endif idx_dc = 0; idx_gc = 0L; - qqsort(idx_key, idx_gt, sizeof(FIELD_PTR), compare); + qqsort(idx_key, (size_t)idx_gt, sizeof(FIELD_PTR), compare); #ifdef HAVE_SETLOCALE setlocale(LC_COLLATE, prev_locale); #endif -- cgit v1.2.3