diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-05-13 11:37:32 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-05-13 11:37:32 +0000 |
| commit | 7d7d2cbcb02206f3393681f2bce198e11e2e185b (patch) | |
| tree | 93410fafc5aa977c748ea492994da3f581d11278 /crypto/bf | |
| parent | 8d111f4a476896a417069d16597ce3009f9bb992 (diff) | |
| download | openssl-new-7d7d2cbcb02206f3393681f2bce198e11e2e185b.tar.gz | |
VMS support.
Submitted by: Richard Levitte <richard@levitte.org>
Diffstat (limited to 'crypto/bf')
| -rw-r--r-- | crypto/bf/bf_opts.c | 19 | ||||
| -rw-r--r-- | crypto/bf/bfspeed.c | 19 |
2 files changed, 18 insertions, 20 deletions
diff --git a/crypto/bf/bf_opts.c b/crypto/bf/bf_opts.c index 7253d765e9..6ac0611918 100644 --- a/crypto/bf/bf_opts.c +++ b/crypto/bf/bf_opts.c @@ -59,7 +59,7 @@ /* 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. */ -#ifndef MSDOS +#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) #define TIMES #endif @@ -71,7 +71,6 @@ extern void exit(); #endif #include <signal.h> -#ifndef VMS #ifndef _IRIX #include <time.h> #endif @@ -79,15 +78,15 @@ extern void exit(); #include <sys/types.h> #include <sys/times.h> #endif -#else /* VMS */ -#include <types.h> -struct tms { - time_t tms_utime; - time_t tms_stime; - time_t tms_uchild; /* I dunno... */ - time_t tms_uchildsys; /* so these names are a guess :-) */ - } + +/* Depending on the VMS version, the tms structure is perhaps defined. + 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) +#undef TIMES #endif + #ifndef TIMES #include <sys/timeb.h> #endif diff --git a/crypto/bf/bfspeed.c b/crypto/bf/bfspeed.c index bca36e5a3b..52758e24b1 100644 --- a/crypto/bf/bfspeed.c +++ b/crypto/bf/bfspeed.c @@ -59,7 +59,7 @@ /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ -#ifndef MSDOS +#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) #define TIMES #endif @@ -71,7 +71,6 @@ extern int exit(); #endif #include <signal.h> -#ifndef VMS #ifndef _IRIX #include <time.h> #endif @@ -79,15 +78,15 @@ extern int exit(); #include <sys/types.h> #include <sys/times.h> #endif -#else /* VMS */ -#include <types.h> -struct tms { - time_t tms_utime; - time_t tms_stime; - time_t tms_uchild; /* I dunno... */ - time_t tms_uchildsys; /* so these names are a guess :-) */ - } + +/* Depending on the VMS version, the tms structure is perhaps defined. + 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) +#undef TIMES #endif + #ifndef TIMES #include <sys/timeb.h> #endif |