diff options
| author | tjr <tjr@FreeBSD.org> | 2004-07-02 09:27:09 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2004-07-02 09:27:09 +0000 |
| commit | d286426955dbe8ac32ebbbb362f4493726263a57 (patch) | |
| tree | 38f59078a2ed432f18be310a616f9a0daf99df78 /contrib/gnu-sort/lib/hard-locale.c | |
| parent | e7a5dd69acca58e5338b737cf0b4a77c603e40b8 (diff) | |
| download | FreeBSD-src-d286426955dbe8ac32ebbbb362f4493726263a57.zip FreeBSD-src-d286426955dbe8ac32ebbbb362f4493726263a57.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/gnu-sort/lib/hard-locale.c')
| -rw-r--r-- | contrib/gnu-sort/lib/hard-locale.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/contrib/gnu-sort/lib/hard-locale.c b/contrib/gnu-sort/lib/hard-locale.c index b3d3a35..ca584d6 100644 --- a/contrib/gnu-sort/lib/hard-locale.c +++ b/contrib/gnu-sort/lib/hard-locale.c @@ -1,6 +1,6 @@ /* hard-locale.c -- Determine whether a locale is hard. - Copyright (C) 1997, 1998, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,19 +21,14 @@ # include <config.h> #endif +#include "hard-locale.h" + #if HAVE_LOCALE_H # include <locale.h> #endif -#if HAVE_STDLIB_H -# include <stdlib.h> -#endif - -#if HAVE_STRING_H -# include <string.h> -#endif - -#include "hard-locale.h" +#include <stdlib.h> +#include <string.h> /* Return nonzero if the current CATEGORY locale is hard, i.e. if you can't get away with assuming traditional C or POSIX behavior. */ |
