From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 25 Jun 2014 13:39:27 +0000 (+0200)
Subject: libbb: fix compile failure if both ARG_MAX and _SC_ARG_MAX are defined
X-Git-Tag: 1_23_0~99
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5aeae36e2b8bcee19c8eb189f55b19febaab4c42;p=oweals%2Fbusybox.git

libbb: fix compile failure if both ARG_MAX and _SC_ARG_MAX are defined

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/libbb/sysconf.c b/libbb/sysconf.c
index 4dbffbebd..031901980 100644
--- a/libbb/sysconf.c
+++ b/libbb/sysconf.c
@@ -8,7 +8,7 @@
  */
 #include "libbb.h"
 
-#if defined _SC_ARG_MAX
+#if !defined(ARG_MAX) && defined(_SC_ARG_MAX)
 unsigned FAST_FUNC bb_arg_max(void)
 {
 	return sysconf(_SC_ARG_MAX);