X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fengine%2Fhw_ncipher.c;h=98fd5227bc6c247994c03fda6382567bdc1cff7a;hp=8799a747d071d5d7ab37808ca65e98da4d74c768;hb=35618bf6adcfe533c1707d71c59733026219818e;hpb=f971ccb2646828aee104c5be5deab9991f0a4d2b

diff --git a/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c
index 8799a747d0..98fd5227bc 100644
--- a/crypto/engine/hw_ncipher.c
+++ b/crypto/engine/hw_ncipher.c
@@ -65,8 +65,8 @@
 #include "engine_int.h"
 #include <openssl/engine.h>
 
-#ifndef NO_HW
-#ifndef NO_HW_NCIPHER
+#ifndef OPENSSL_NO_HW
+#ifndef OPENSSL_NO_HW_NCIPHER
 
 /* Attribution notice: nCipher have said several times that it's OK for
  * us to implement a general interface to their boxes, and recently declared
@@ -376,7 +376,7 @@ static void release_context(HWCryptoHook_ContextHandle hac)
 	}
 
 /* (de)initialisation functions. */
-static int hwcrhk_init()
+static int hwcrhk_init(void)
 	{
 	HWCryptoHook_Init_t *p1;
 	HWCryptoHook_Finish_t *p2;
@@ -475,7 +475,7 @@ err:
 	return 0;
 	}
 
-static int hwcrhk_finish()
+static int hwcrhk_finish(void)
 	{
 	int to_return = 1;
 	if(hwcrhk_dso == NULL)
@@ -1016,5 +1016,5 @@ static void hwcrhk_log_message(void *logstr, const char *message)
 	CRYPTO_w_unlock(CRYPTO_LOCK_BIO);
 	}
 
-#endif /* !NO_HW_NCIPHER */
-#endif /* !NO_HW */
+#endif /* !OPENSSL_NO_HW_NCIPHER */
+#endif /* !OPENSSL_NO_HW */