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 <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/crypto/hcrypto/kernel/config.h b/src/crypto/hcrypto/kernel/config.h
index 29e9947ab5ecdf37fd4b439f9122e00814fb6560..724ba18b5c7c47c72f525a01b74e8ec8898b611e 100644 (file)
--- 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 <rx/rx.h>