root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

djgpp: Define WATT32_NO_OLDIES before including socket headers 

If this macro is left undefined, Watt-32 will "helpfully" declare some
typedefs such as 'byte' and 'word' in the global namespace.  This broke
compilation of apps/s_client.c.

CLA: trivial

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19274)
This commit is contained in:
J.W. Jagersma 2022-09-25 19:13:32 +02:00 committed by Tomas Mraz
parent 651255941c
commit 8ae74c5bc0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/sockets.h
View File

@ -28,6 +28,8 @@
# elif defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) # elif defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
# if defined(__DJGPP__) # if defined(__DJGPP__)
# define WATT32
# define WATT32_NO_OLDIES
# include <sys/socket.h> # include <sys/socket.h>
# include <sys/un.h> # include <sys/un.h>
# include <tcp.h> # include <tcp.h>
@ -150,8 +152,6 @@ struct servent *PASCAL getservbyname(const char *, const char *);
# define readsocket(s,b,n) recv((s),(b),(n),0) # define readsocket(s,b,n) recv((s),(b),(n),0)
# define writesocket(s,b,n) send((s),(b),(n),0) # define writesocket(s,b,n) send((s),(b),(n),0)
# elif defined(__DJGPP__) # elif defined(__DJGPP__)
# define WATT32
# define WATT32_NO_OLDIES
# define closesocket(s) close_s(s) # define closesocket(s) close_s(s)
# define readsocket(s,b,n) read_s(s,b,n) # define readsocket(s,b,n) read_s(s,b,n)
# define writesocket(s,b,n) send(s,b,n,0) # define writesocket(s,b,n) send(s,b,n,0)