d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify compatibility ifdef.

Browse Source
This commit is contained in:
Warner Losh 2003-04-04 04:39:29 +00:00
parent 9d6fd8f041
commit 76d94537fe
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=113045
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/xargs/xargs.c
View File

@ -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]",