- (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix

   compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot
   AT fefe.de

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c6a3fe893..96196fc80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20100314
+ - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
+   compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot
+   AT fefe.de
+
 20100312
  - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir)
  - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets.
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index d3bfb9838..8e3f57ace 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -17,8 +17,6 @@
 
 #include "includes.h"
 
-#ifdef ENABLE_PKCS11
-
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -39,6 +37,8 @@
 #include "authfd.h"
 #include "ssh-pkcs11.h"
 
+#ifdef ENABLE_PKCS11
+
 /* borrows code from sftp-server and ssh-agent */
 
 struct pkcs11_keyinfo {