From 5c80b04ad533e531e552e7e775b6df48dd1fcecc Mon Sep 17 00:00:00 2001 From: miod <> Date: Mon, 28 Apr 2014 21:14:50 +0000 Subject: Remove WIN32, WIN64 and MINGW32 tentacles. Also check for _LP64 rather than __arch64__ (the former being more reliable than __LP64__ or __arch64__) to tell 64-bit int platforms apart from 32-bit int platforms. Loosely based upon a diff from Martijn van Duren on tech@ --- src/lib/libcrypto/des/enc_read.c | 8 -------- src/lib/libcrypto/des/enc_writ.c | 4 ---- 2 files changed, 12 deletions(-) (limited to 'src/lib/libcrypto/des') diff --git a/src/lib/libcrypto/des/enc_read.c b/src/lib/libcrypto/des/enc_read.c index 23ad458dcf..e1ac04c5b3 100644 --- a/src/lib/libcrypto/des/enc_read.c +++ b/src/lib/libcrypto/des/enc_read.c @@ -150,11 +150,7 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, /* first - get the length */ while (net_num < HDRSIZE) { -#ifndef OPENSSL_SYS_WIN32 i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); -#else - i=_read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); -#endif #ifdef EINTR if ((i == -1) && (errno == EINTR)) continue; #endif @@ -176,11 +172,7 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, net_num=0; while (net_num < rnum) { -#ifndef OPENSSL_SYS_WIN32 i=read(fd,(void *)&(net[net_num]),rnum-net_num); -#else - i=_read(fd,(void *)&(net[net_num]),rnum-net_num); -#endif #ifdef EINTR if ((i == -1) && (errno == EINTR)) continue; #endif diff --git a/src/lib/libcrypto/des/enc_writ.c b/src/lib/libcrypto/des/enc_writ.c index 8f6b033c87..18562310ee 100644 --- a/src/lib/libcrypto/des/enc_writ.c +++ b/src/lib/libcrypto/des/enc_writ.c @@ -156,11 +156,7 @@ int DES_enc_write(int fd, const void *_buf, int len, { /* eay 26/08/92 I was not doing writing from where we * got up to. */ -#ifndef _WIN32 i=write(fd,(void *)&(outbuf[j]),outnum-j); -#else - i=_write(fd,(void *)&(outbuf[j]),outnum-j); -#endif if (i == -1) { #ifdef EINTR -- cgit v1.2.3-55-g6feb