From b72dee7e432894a54443ddfc0ebdb74e44b73a21 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 4 Apr 2003 04:39:29 +0000
Subject: Simplify compatibility ifdef.

---
 usr.bin/xargs/xargs.c | 11 +++++++----
 1 file 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]",
-- 
cgit v1.1