Use new-style system-id macros everywhere possible. I hope I haven't

[oweals/openssl.git] / crypto / des / des_opts.c

diff --git a/crypto/des/des_opts.c b/crypto/des/des_opts.c
index 500509ea733b90decf1a2cb75cd9c692a2b22030..c1076757bb089f0f226aa7f87d5a8a63414df6d9 100644 (file)
--- a/crypto/des/des_opts.c
+++ b/crypto/des/des_opts.c
@@ -59,13 +59,14 @@
 /* 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))
 #define TIMES
 #endif
 
 #include <stdio.h>
-#ifndef MSDOS
-#include <unistd.h>
+#ifndef OPENSSL_SYS_MSDOS
+#include <openssl/e_os2.h>
+#include OPENSSL_UNISTD
 #else
 #include <io.h>
 extern void exit();
@@ -83,7 +84,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
 
@@ -433,17 +434,17 @@ 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
 
-       des_set_key(&key,sch);
-       des_set_key(&key2,sch2);
-       des_set_key(&key3,sch3);
+       des_set_key_unchecked(&key,sch);
+       des_set_key_unchecked(&key2,sch2);
+       des_set_key_unchecked(&key3,sch3);
 
 #ifndef SIGALRM
        fprintf(stderr,"First we calculate the approximate speed ...\n");
-       des_set_key(&key,sch);
+       des_set_key_unchecked(&key,sch);
        count=10;
        do      {
                long i;
@@ -597,7 +598,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
        }