[git commit] libbb: fix compile failure if both ARG_MAX and _SC_ARG_MAX are defined

Denys Vlasenko vda.linux at googlemail.com
Wed Jun 25 13:39:27 UTC 2014


commit: http://git.busybox.net/busybox/commit/?id=5aeae36e2b8bcee19c8eb189f55b19febaab4c42
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/sysconf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libbb/sysconf.c b/libbb/sysconf.c
index 4dbffbe..0319019 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);


More information about the busybox-cvs mailing list