diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-04-04 04:39:29 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-04-04 04:39:29 +0000 |
| commit | 76d94537fe189cd9632f8b5514ced7d823bb78c3 (patch) | |
| tree | 7cd12944aef14843fed8ae3874c9fad6f6b11c28 /usr.bin | |
| parent | 9d6fd8f041a5822634e53e591d7f97c7913b5d82 (diff) | |
| download | src-76d94537fe189cd9632f8b5514ced7d823bb78c3.tar.gz src-76d94537fe189cd9632f8b5514ced7d823bb78c3.zip | |
Simplify compatibility ifdef.
Notes
Notes:
svn path=/head/; revision=113045
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/xargs/xargs.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 76aa5b78243a..8b75dbb97864 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -52,13 +52,17 @@ static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; __FBSDID("$FreeBSD$"); #include <sys/param.h> +#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500017 +#define HAS_LANGINFO +#endif + #include <sys/wait.h> #include <err.h> #include <errno.h> #include <fcntl.h> -#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \ - __FreeBSD_version >= 500017 +#ifdef HAS_LANGINFO #include <langinfo.h> #endif #include <locale.h> @@ -587,8 +591,7 @@ prompt(void) (void)fflush(stderr); if ((response = fgetln(ttyfp, &rsize)) == NULL || regcomp(&cre, -#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \ - __FreeBSD_version >= 500017 +#ifdef HAS_LANGINFO nl_langinfo(YESEXPR), #else "^[yY]", |