Make the padlock engine build correctly

[openssl.git] / engines / e_padlock.c

diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index daf8c94ceb5e044684a3d3c4b199138ba4c4b5a4..10b5a05ce852a1947bfd5f8203736ba2419183cf 100644 (file)
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -28,7 +28,7 @@
  */
 
 #  undef COMPILE_HW_PADLOCK
  */
 
 #  undef COMPILE_HW_PADLOCK

-#  if !defined(I386_ONLY) && defined(PADLOCK_ASM)
+#  if defined(PADLOCK_ASM)

 #   define COMPILE_HW_PADLOCK
 #   ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *ENGINE_padlock(void);
 #   define COMPILE_HW_PADLOCK
 #   ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *ENGINE_padlock(void);


@@ -135,7 +135,7 @@ static int padlock_init(ENGINE *e)
  * This stuff is needed if this ENGINE is being compiled into a
  * self-contained shared-library.
  */
  * This stuff is needed if this ENGINE is being compiled into a
  * self-contained shared-library.
  */

-#   ifdef DYNAMIC_ENGINE
+#   ifndef OPENSSL_NO_DYNAMIC_ENGINE

 static int padlock_bind_fn(ENGINE *e, const char *id)
 {
     if (id && (strcmp(id, padlock_id) != 0)) {
 static int padlock_bind_fn(ENGINE *e, const char *id)
 {
     if (id && (strcmp(id, padlock_id) != 0)) {


@@ -151,7 +151,7 @@ static int padlock_bind_fn(ENGINE *e, const char *id)
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(padlock_bind_fn)
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(padlock_bind_fn)

-#   endif                       /* DYNAMIC_ENGINE */
+#   endif                       /* !OPENSSL_NO_DYNAMIC_ENGINE */

 /* ===== Here comes the "real" engine ===== */
 
 /* Some AES-related constants */
 /* ===== Here comes the "real" engine ===== */
 
 /* Some AES-related constants */