xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 0ee8ff4d83f8a744b00c7e589b31dc0aadb6afe6
parent d9d9a26e43c18117f8fb2fcd868dc8366bc86b33
Author: Brian Swetland <swetland@frotz.net>
Date:   Wed, 28 Mar 2018 16:18:10 -0700

Merge pull request #2 from akoskovacs/static_assert_fix

Don't redefine static_assert, fixes compilation error
Diffstat:
Mtools/mkfs.c | 4+++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/mkfs.c b/tools/mkfs.c @@ -11,7 +11,9 @@ #include "../include/stat.h" #include "../include/param.h" -#define static_assert(a, b) do { switch (0) case 0: case (a): ; } while (0) +#ifndef static_assert +# define static_assert(a, b) do { switch (0) case 0: case (a): ; } while (0) +#endif // static_assert int nblocks = 985; int nlog = LOGSIZE;