summaryrefslogtreecommitdiffstats
path: root/usr.bin/xargs
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2003-04-04 04:39:29 +0000
committerimp <imp@FreeBSD.org>2003-04-04 04:39:29 +0000
commitb72dee7e432894a54443ddfc0ebdb74e44b73a21 (patch)
tree7cd12944aef14843fed8ae3874c9fad6f6b11c28 /usr.bin/xargs
parent106c479ccdbfe94b401575abbe484f6d96d20994 (diff)
downloadFreeBSD-src-b72dee7e432894a54443ddfc0ebdb74e44b73a21.zip
FreeBSD-src-b72dee7e432894a54443ddfc0ebdb74e44b73a21.tar.gz
Simplify compatibility ifdef.
Diffstat (limited to 'usr.bin/xargs')
-rw-r--r--usr.bin/xargs/xargs.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 76aa5b7..8b75dbb 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]",
OpenPOWER on IntegriCloud