From: giovanni <giovanni@openbsd.org>
Date: Thu, 24 Apr 2014 18:35:25 +0000 (+0000)
Subject: unifdef MSDOS
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=039b22ab4e1d311310b9fd25588dcbaec9592057;p=openbsd

unifdef MSDOS
ok miod@
---

diff --git a/lib/libcrypto/des/des_locl.h b/lib/libcrypto/des/des_locl.h
index 00fcd2a8ac9..1b0c53038c4 100644
--- a/lib/libcrypto/des/des_locl.h
+++ b/lib/libcrypto/des/des_locl.h
@@ -61,11 +61,6 @@
 
 #include <openssl/e_os2.h>
 
-#if defined(OPENSSL_SYS_WIN32)
-#ifndef OPENSSL_SYS_MSDOS
-#define OPENSSL_SYS_MSDOS
-#endif
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -74,14 +69,8 @@
 #include <math.h>
 #include <openssl/des.h>
 
-#ifdef OPENSSL_SYS_MSDOS		/* Visual C++ 2.1 (Windows NT/95) */
-#include <stdlib.h>
-#include <errno.h>
-#include <time.h>
-#include <io.h>
-#endif
 
-#if defined(__STDC__) || defined(OPENSSL_SYS_VMS) || defined(M_XENIX) || defined(OPENSSL_SYS_MSDOS)
+#if defined(__STDC__)
 #include <string.h>
 #endif
 
diff --git a/lib/libssl/src/crypto/des/des_locl.h b/lib/libssl/src/crypto/des/des_locl.h
index 00fcd2a8ac9..1b0c53038c4 100644
--- a/lib/libssl/src/crypto/des/des_locl.h
+++ b/lib/libssl/src/crypto/des/des_locl.h
@@ -61,11 +61,6 @@
 
 #include <openssl/e_os2.h>
 
-#if defined(OPENSSL_SYS_WIN32)
-#ifndef OPENSSL_SYS_MSDOS
-#define OPENSSL_SYS_MSDOS
-#endif
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -74,14 +69,8 @@
 #include <math.h>
 #include <openssl/des.h>
 
-#ifdef OPENSSL_SYS_MSDOS		/* Visual C++ 2.1 (Windows NT/95) */
-#include <stdlib.h>
-#include <errno.h>
-#include <time.h>
-#include <io.h>
-#endif
 
-#if defined(__STDC__) || defined(OPENSSL_SYS_VMS) || defined(M_XENIX) || defined(OPENSSL_SYS_MSDOS)
+#if defined(__STDC__)
 #include <string.h>
 #endif