From 3ba324b6b6acf8db34bde5a79563fe9161f9896c Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 3 Jun 2022 09:26:00 -0400 Subject: libarchive: Remove a system preprocessor macro that conflicts with a local var On SunOS i386, the system headers sometimes define macro names corresponding to register names, short and with no prefix. Undefine one that conflicts with our code. --- Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c b/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c index b913a4d..4f9b2d9 100644 --- a/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c +++ b/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c @@ -28,6 +28,9 @@ #define PARALLELISM_DEGREE 8 +/* Remove system-defined preprocessor defintions that conflict with us. */ +#undef FS + /* blake2sp_init_param defaults to setting the expecting output length from the digest_length parameter block field. -- cgit v0.12