summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-06-03 13:26:00 (GMT)
committerBrad King <brad.king@kitware.com>2022-06-04 12:15:20 (GMT)
commit3ba324b6b6acf8db34bde5a79563fe9161f9896c (patch)
tree7f904a29649d61ab3e735aadba7c7296327bfe2e
parent4a283fcc311035ed8db8044dcbeb9a75dd452cab (diff)
downloadCMake-3ba324b6b6acf8db34bde5a79563fe9161f9896c.zip
CMake-3ba324b6b6acf8db34bde5a79563fe9161f9896c.tar.gz
CMake-3ba324b6b6acf8db34bde5a79563fe9161f9896c.tar.bz2
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.
-rw-r--r--Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c3
1 files changed, 3 insertions, 0 deletions
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.