From: Antoine Verheijen Date: Fri, 8 Jul 2011 17:47:39 +0000 (-0600) Subject: Remove pre-existing assert macro in hcrypto header. X-Git-Tag: upstream/1.8.0_pre1^2~3557 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2d794a5e5d8154b096596f45bed93cc41b36005a;p=packages%2Fo%2Fopenafs.git Remove pre-existing assert macro in hcrypto header. The config.h header for hcrypto defines an assert macro for use by RX. OpenBSD already has an assert macro definition so this new one causes screaming by the compiler about re-definition. This patch adds the directives to remove any pre-existing definition of assert, if one exists, prior to defining the new one. Change-Id: I01d5a1f26617fecfd0ffcc3930a7c7881beb8183 Reviewed-on: http://gerrit.openafs.org/4958 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/crypto/hcrypto/kernel/config.h b/src/crypto/hcrypto/kernel/config.h index 29e9947ab..724ba18b5 100644 --- a/src/crypto/hcrypto/kernel/config.h +++ b/src/crypto/hcrypto/kernel/config.h @@ -30,6 +30,9 @@ /* Asserting is a mess - we need the RX headers in order to get a definition * for osi_Assert */ +#if defined(assert) +#undef assert +#endif #define assert osi_Assert #include