Really get X509_CRL_CHECK_ALL right this time...

[openssl.git] / crypto / bf / bf_opts.c

diff --git a/crypto/bf/bf_opts.c b/crypto/bf/bf_opts.c
index a0663b5801e028b95677c391aed359574b2ab9d0..171dada2cabb1eb468dfb99359fa7214bc8bca90 100644 (file)
--- a/crypto/bf/bf_opts.c
+++ b/crypto/bf/bf_opts.c
@@ -59,17 +59,16 @@
 /* define PART1, PART2, PART3 or PART4 to build only with a few of the options.
  * This is for machines with 64k code segment size restrictions. */
 
-#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
 #define TIMES
 #endif
 
 #include <stdio.h>
-#ifndef MSDOS
-#include <unistd.h>
-#else
-#include <io.h>
-extern void exit();
-#endif
+
+#include <openssl/e_os2.h>
+#include OPENSSL_UNISTD_IO
+OPENSSL_DECLARE_EXIT
+
 #include <signal.h>
 #ifndef _IRIX
 #include <time.h>
@@ -83,7 +82,7 @@ extern void exit();
    The __TMS macro will show if it was.  If it wasn't defined, we should
    undefine TIMES, since that tells the rest of the program how things
    should be handled.                          -- Richard Levitte */
-#if defined(VMS) && defined(__DECC) && !defined(__TMS)
+#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
 #undef TIMES
 #endif
 
@@ -243,7 +242,7 @@ int main(int argc, char **argv)
                }
 
 #ifndef TIMES
-       fprintf(stderr,"To get the most acurate results, try to run this\n");
+       fprintf(stderr,"To get the most accurate results, try to run this\n");
        fprintf(stderr,"program when this computer is idle.\n");
 #endif
 
@@ -323,7 +322,7 @@ int main(int argc, char **argv)
                break;
                }
        exit(0);
-#if defined(LINT) || defined(MSDOS)
+#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
        return(0);
 #endif
        }