From d2b3c9742a7df4ab87384039c99682d1944f66d7 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 13 Apr 2014 15:25:35 +0000
Subject: Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build
 machinery.

---
 src/lib/libcrypto/mdc2/mdc2dgst.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/mdc2')

diff --git a/src/lib/libcrypto/mdc2/mdc2dgst.c b/src/lib/libcrypto/mdc2/mdc2dgst.c
index b74bb1a759..d66ed6a1c6 100644
--- a/src/lib/libcrypto/mdc2/mdc2dgst.c
+++ b/src/lib/libcrypto/mdc2/mdc2dgst.c
@@ -59,9 +59,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <openssl/crypto.h>
 #include <openssl/des.h>
 #include <openssl/mdc2.h>
-#include <openssl/crypto.h>
 
 #undef c2l
 #define c2l(c,l)	(l =((DES_LONG)(*((c)++)))    , \
-- 
cgit v1.2.3-55-g6feb