From bd5a66272a209275525e9b682866536ecc1fd55c Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 27 Apr 2014 20:22:32 +0000
Subject: Unifdef -U OPENSSL_BUILD_SHLIBCRYPTO, since all it causes under Unix
 is to redefine OPENSSL_EXTERN from `extern' to `extern'.

---
 src/lib/libcrypto/des/des.h      |  4 ----
 src/lib/libcrypto/des/des_locl.h | 12 +-----------
 src/lib/libcrypto/des/des_ver.h  |  5 -----
 3 files changed, 1 insertion(+), 20 deletions(-)

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

diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index 122fc1403c..3eff114102 100644
--- a/src/lib/libcrypto/des/des.h
+++ b/src/lib/libcrypto/des/des.h
@@ -66,10 +66,6 @@
 #error DES is disabled.
 #endif
 
-#ifdef OPENSSL_BUILD_SHLIBCRYPTO
-# undef OPENSSL_EXTERN
-# define OPENSSL_EXTERN OPENSSL_EXPORT
-#endif
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h
index 1b0c53038c..1a21467b3e 100644
--- a/src/lib/libcrypto/des/des_locl.h
+++ b/src/lib/libcrypto/des/des_locl.h
@@ -61,24 +61,14 @@
 
 #include <openssl/e_os2.h>
 
-
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <unistd.h>
 #include <math.h>
 #include <openssl/des.h>
 
-
-#if defined(__STDC__)
-#include <string.h>
-#endif
-
-#ifdef OPENSSL_BUILD_SHLIBCRYPTO
-# undef OPENSSL_EXTERN
-# define OPENSSL_EXTERN OPENSSL_EXPORT
-#endif
-
 #define ITERATIONS 16
 #define HALF_ITERATIONS 8
 
diff --git a/src/lib/libcrypto/des/des_ver.h b/src/lib/libcrypto/des/des_ver.h
index d1ada258a6..b4a6ffdc39 100644
--- a/src/lib/libcrypto/des/des_ver.h
+++ b/src/lib/libcrypto/des/des_ver.h
@@ -58,11 +58,6 @@
 
 #include <openssl/e_os2.h>
 
-#ifdef OPENSSL_BUILD_SHLIBCRYPTO
-# undef OPENSSL_EXTERN
-# define OPENSSL_EXTERN OPENSSL_EXPORT
-#endif
-
 /* The following macros make sure the names are different from libdes names */
 #define DES_version OSSL_DES_version
 #define libdes_version OSSL_libdes_version
-- 
cgit v1.2.3-55-g6feb