diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-04-05 20:30:30 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-04-05 20:30:30 +0000 |
| commit | 30aaff1192acd09c20cd6e8c70c9e8d023d4c818 (patch) | |
| tree | b6fc0351de0d24cf42e51ee60290331a14961c9c /usr.bin/xargs | |
| parent | ca6a2c5aef9d2fdfb6f19fc7d050288f91c7afa2 (diff) | |
Notes
Diffstat (limited to 'usr.bin/xargs')
| -rw-r--r-- | usr.bin/xargs/xargs.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 8b75dbb97864b..a31f2a62a0e34 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -52,19 +52,12 @@ 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> -#ifdef HAS_LANGINFO #include <langinfo.h> -#endif #include <locale.h> #include <paths.h> #include <regex.h> @@ -590,13 +583,7 @@ prompt(void) (void)fprintf(stderr, "?..."); (void)fflush(stderr); if ((response = fgetln(ttyfp, &rsize)) == NULL || - regcomp(&cre, -#ifdef HAS_LANGINFO - nl_langinfo(YESEXPR), -#else - "^[yY]", -#endif - REG_BASIC) != 0) { + regcomp(&cre, nl_langinfo(YESEXPR), REG_BASIC) != 0) { (void)fclose(ttyfp); return (0); } |