2 files changed, 4 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f17eb361f..3d9c4e734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
    CVS ID.
  - (djm) Remove "noip6" option from RedHat spec file. This may now be 
    set at runtime using AddressFamily option.
+ - (djm) Fix use of macro before #define in cipher-aes.c
 
 20030530
  - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
@@ -1632,4 +1633,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2758 2003/06/02 07:43:19 djm Exp $
+$Id: ChangeLog,v 1.2759 2003/06/02 08:57:59 djm Exp $
diff --git a/cipher-aes.c b/cipher-aes.c
index bbfbe7210..c41def600 100644
--- a/cipher-aes.c
+++ b/cipher-aes.c
@@ -22,8 +22,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
 #include "includes.h"
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
 RCSID("$OpenBSD: cipher-aes.c,v 1.1 2003/05/15 03:08:29 markus Exp $");
 
 #include <openssl/evp.h>
@@ -153,4 +153,4 @@ evp_rijndael(void)
 #endif
         return (&rijndal_cbc);
 }
-#endif
+#endif /* OPENSSL_VERSION_NUMBER */