From e2377733708e42c11716f39e1f7c81d56b03f33b Mon Sep 17 00:00:00 2001 From: Robert Swiecki Date: Mon, 12 Feb 2018 22:39:42 +0100 Subject: [PATCH] macros.h: surround ARRAYSIZE by guards --- Makefile | 5 ++--- macros.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3d45ab7..e91a5b8 100644 --- a/Makefile +++ b/Makefile @@ -94,8 +94,8 @@ caps.o: caps.h nsjail.h logs.h macros.h util.h cgroup.o: cgroup.h nsjail.h logs.h util.h cmdline.o: cmdline.h nsjail.h logs.h caps.h config.h macros.h mnt.h user.h cmdline.o: util.h -config.o: caps.h nsjail.h logs.h cmdline.h config.h config.pb.h macros.h -config.o: mnt.h user.h util.h +config.o: caps.h nsjail.h logs.h cmdline.h config.h macros.h mnt.h user.h +config.o: util.h contain.o: contain.h nsjail.h logs.h caps.h cgroup.h cpu.h mnt.h net.h pid.h contain.o: user.h uts.h cpu.o: cpu.h nsjail.h logs.h util.h @@ -110,4 +110,3 @@ subproc.o: sandbox.h user.h util.h uts.o: uts.h nsjail.h logs.h user.o: user.h nsjail.h logs.h macros.h subproc.h util.h util.o: util.h nsjail.h logs.h macros.h -config.pb.o: config.pb.h diff --git a/macros.h b/macros.h index 0ed8b84..8803eaa 100644 --- a/macros.h +++ b/macros.h @@ -35,7 +35,9 @@ })) #endif /* !defined(TEMP_FAILURE_RETRY) */ +#if !defined(ARRAYSIZE) #define ARRAYSIZE(array) (sizeof(array) / sizeof(*array)) +#endif /* !defined(ARRAYSIZE) */ #define UNUSED __attribute__((unused)) #if 0 /* Works, but needs -fblocks and libBlocksRuntime with clang */