diff options
| author | Jim Meyering <jim@meyering.net> | 1999-05-20 03:52:15 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1999-05-20 03:52:15 +0000 |
| commit | 61b2bceab7e154b1fb14c2f6a3e6992c3a1049e3 (patch) | |
| tree | 3f996584946fd8d7fb2407c4b9fc7871adacd41d /src/sort.c | |
| parent | 0f5bb7dd4e4e710a3128c1a7d5c5350ac7b0f9f1 (diff) | |
| download | coreutils-61b2bceab7e154b1fb14c2f6a3e6992c3a1049e3.tar.xz | |
(MONTHTAB_CONST): Renamed from NLS_CONST; the use
is also changed. Define to const also if !HAVE_NL_LANGINFO.
(usage): `,' -> `;' (English typo).
Diffstat (limited to 'src/sort.c')
| -rw-r--r-- | src/sort.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sort.c b/src/sort.c index 5ec89a5e3..0eb846a63 100644 --- a/src/sort.c +++ b/src/sort.c @@ -174,15 +174,15 @@ static char fold_toupper[UCHAR_LIM]; #define MONTHS_PER_YEAR 12 -#ifndef ENABLE_NLS -# define NLS_CONST const +#if defined ENABLE_NLS && HAVE_NL_LANGINFO +# define MONTHTAB_CONST /* empty */ #else -# define NLS_CONST /* empty */ +# define MONTHTAB_CONST const #endif /* Table mapping month names to integers. Alphabetic order allows binary search. */ -static NLS_CONST struct month monthtab[] = +static MONTHTAB_CONST struct month monthtab[] = { {"APR", 4}, {"AUG", 8}, @@ -287,7 +287,7 @@ Write sorted concatenation of all FILE(s) to standard output.\n\ printf (_("\ POS is F[.C][OPTS], where F is the field number and C the character position\n\ in the field, both counted from one with -k, from zero with the obsolescent\n\ -form. OPTS is made up of one or more of Mbdfinr, this effectively disables\n\ +form. OPTS is made up of one or more of Mbdfinr; this effectively disables\n\ global -Mbdfinr settings for that key. If no key is given, use the entire\n\ line as the key. With no FILE, or when FILE is -, read standard input.\n\ ") @@ -1550,7 +1550,7 @@ mergefps (FILE **fps, register int nfps, FILE *ofp) /* Repeatedly output the smallest line until no input remains. */ while (nfps) { - /* If uniqified output is turned on, output only the first of + /* If uniquified output is turned on, output only the first of an identical series of lines. */ if (unique) { |