diff options
| author | Andy Polyakov <appro@openssl.org> | 1999-09-11 17:54:18 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 1999-09-11 17:54:18 +0000 |
| commit | 17f389bbbfccf057a8bc04084ed068c4b368e751 (patch) | |
| tree | 7daa85ce7f0f44aff61853dc10c5915d465ba43c /crypto/des | |
| parent | 5bdae1675c8b450bed091b9605ae9d10d61adfc7 (diff) | |
Initial support for MacOS.
This will soon be complemented with MacOS specific source code files and
INSTALL.MacOS.
I (Andy) have decided to get rid of a number of #include <sys/types.h>.
I've verified it's ok (both by examining /usr/include/*.h and compiling)
on a number of Unix platforms. Unfortunately I don't have Windows box
to verify this on. I really appreciate if somebody could try to compile
it and contact me a.s.a.p. in case a problem occurs.
Submitted by: Roy Wood <roy@centricsystems.ca>
Reviewed by: Andy Polyakov <appro@fy.chalmers.se>
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/enc_read.c | 4 | ||||
| -rw-r--r-- | crypto/des/read_pwd.c | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/crypto/des/enc_read.c b/crypto/des/enc_read.c index 694970ccd2..7399ff7269 100644 --- a/crypto/des/enc_read.c +++ b/crypto/des/enc_read.c @@ -147,7 +147,7 @@ int des_enc_read(int fd, void *buf, int len, des_key_schedule sched, /* first - get the length */ while (net_num < HDRSIZE) { - i=read(fd,&(net[net_num]),HDRSIZE-net_num); + i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); #ifdef EINTR if ((i == -1) && (errno == EINTR)) continue; #endif @@ -169,7 +169,7 @@ int des_enc_read(int fd, void *buf, int len, des_key_schedule sched, net_num=0; while (net_num < rnum) { - i=read(fd,&(net[net_num]),rnum-net_num); + i=read(fd,(void *)&(net[net_num]),rnum-net_num); #ifdef EINTR if ((i == -1) && (errno == EINTR)) continue; #endif diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index fed49652c0..a262f98ed7 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -123,7 +123,7 @@ #undef SGTTY #endif -#if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS) +#if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS) && !defined(MAC_OS_pre_X) #undef TERMIOS #undef TERMIO #define SGTTY @@ -153,7 +153,7 @@ #define TTY_set(tty,data) ioctl(tty,TIOCSETP,data) #endif -#if !defined(_LIBC) && !defined(MSDOS) && !defined(VMS) +#if !defined(_LIBC) && !defined(MSDOS) && !defined(VMS) && !defined(MAC_OS_pre_X) #include <sys/ioctl.h> #endif @@ -174,6 +174,15 @@ struct IOSB { }; #endif +#ifdef MAC_OS_pre_X +/* + * This one needs work. As a matter of fact the code is unoperational + * and this is only a trick to get it compiled. + * <appro@fy.chalmers.se> + */ +#define TTY_STRUCT int +#endif + #ifndef NX509_SIG #define NX509_SIG 32 #endif |