From f7a76b9c450c05abb799e1103d90b51f9f06c0c3 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 6 Nov 2007 15:25:02 +0000 Subject: Some changes to allow an unsorted file list even if the iconv option was disabled via configure. --- hlink.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'hlink.c') diff --git a/hlink.c b/hlink.c index 2392ecdb..962261c7 100644 --- a/hlink.c +++ b/hlink.c @@ -34,11 +34,9 @@ extern int protocol_version; extern int remove_source_files; extern int stdout_format_has_i; extern int maybe_ATTRS_REPORT; +extern int unsort_ndx; extern char *basis_dir[]; extern struct file_list *cur_flist; -#ifdef ICONV_OPTION -extern int ic_ndx; -#endif #ifdef SUPPORT_HARD_LINKS @@ -145,11 +143,9 @@ static void match_gnums(int32 *ndx_list, int ndx_count) break; F_HL_PREV(file) = prev; /* The linked list must use raw ndx values. */ -#ifdef ICONV_OPTION - if (ic_ndx) + if (unsort_ndx) prev = F_NDX(file); else -#endif prev = ndx_list[from] + hlink_flist->ndx_start; } if (prev < 0 && !inc_recurse) { @@ -163,11 +159,9 @@ static void match_gnums(int32 *ndx_list, int ndx_count) file->flags |= FLAG_HLINK_LAST; F_HL_PREV(file) = prev; if (inc_recurse && CVAL(node->data, 0) == 0) { -#ifdef ICONV_OPTION - if (ic_ndx) + if (unsort_ndx) prev = F_NDX(file); else -#endif prev = ndx_list[from] + hlink_flist->ndx_start; SIVAL(node->data, 1, prev); } -- cgit v1.2.3