[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  d2c3d5d4fcfee0820ed3e7018f9b1537a97cbe2e (commit)
      from  84cf97af0691290d53c0a51807fa15f0843219ef (commit)


- Log -----------------------------------------------------------------
commit d2c3d5d4fcfee0820ed3e7018f9b1537a97cbe2e
Author: Ben Laurie <ben at links.org>
Date:   Sat Oct 24 18:37:12 2015 +0100

    Probably fix travis (wine build).
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/engine/eng_cryptodev.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index c67ecc5..c660bb3 100644
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -45,20 +45,20 @@
 #include <sys/types.h>
 #ifdef HAVE_CRYPTODEV
 # include <crypto/cryptodev.h>
+# include <sys/ioctl.h>
+# include <errno.h>
+# include <stdio.h>
+# include <unistd.h>
+# include <fcntl.h>
+# include <stdarg.h>
+# include <syslog.h>
+# include <errno.h>
+# include <string.h>
 #endif
 #include <openssl/dh.h>
 #include <openssl/dsa.h>
 #include <openssl/err.h>
 #include <openssl/rsa.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <syslog.h>
-#include <errno.h>
-#include <string.h>
 
 #ifndef HAVE_CRYPTODEV