summaryrefslogtreecommitdiffstats
path: root/crypto/bio/bss_sock.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-05-10 14:41:19 +0200
committerRichard Levitte <levitte@openssl.org>2016-05-12 22:10:55 +0200
commit2c25ebd1e29a837b1c0e5fea5f464d4b6ddbab5a (patch)
tree1dcc46d581880394fbf16dd85e38e12eb115bcbc /crypto/bio/bss_sock.c
parentae69c7d35351f9b1dcf42a21455e62d0ed5379e9 (diff)
DJGPP adjustments
* Configure: Replaced -DTERMIO by -DTERMIOS in CFLAGS. * crypto/bio/bss_dgram.c [WATT32]: Remove obsolete redefinition of function names: sock_write, sock_read and sock_puts. * crypto/bio/bss_sock.c [WATT32]: For Watt-32 2.2.11 sock_write, sock_read and sock_puts are redefined to their private names so their names must be undefined first before they can be redefined again. * crypto/bio/bss_file.c (file_fopen) [__DJGPP__]: Make a copy of the passed file name and replace the leading dots in the dirname part and the basname part of the file name, unless LFN is supported. * e_os.h [__DJGPP__]: Undefine macro DEVRANDOM_EGD. Neither MS-DOS nor FreeDOS provide 'egd' sockets. New macro HAS_LFN_SUPPORT checks if underlying file system supports long file names or not. Include sys/un.h. Define WATT32_NO_OLDIES. * INSTALL.DJGPP: Update URL of WATT-32 library. Submitted by Juan Manuel Guerrero <juan.guerrero@gmx.de> RT#4217 Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/bio/bss_sock.c')
-rw-r--r--crypto/bio/bss_sock.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index c1f76a24a7..c4e263dabf 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -66,7 +66,11 @@
# include <openssl/bio.h>
# ifdef WATT32
-# define sock_write SockWrite /* Watt-32 uses same names */
+/* Watt-32 uses same names */
+# undef sock_write
+# undef sock_read
+# undef sock_puts
+# define sock_write SockWrite
# define sock_read SockRead
# define sock_puts SockPuts
# endif