diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-04-21 14:08:49 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-15 20:23:38 +0200 |
| commit | 8c10e1b660be1286439e15c9a955461f25b53616 (patch) | |
| tree | eb7e28be82c4611ce1f193818bc32999ba964f85 | |
| parent | 6d382c74b375f1f8c44f04ec3de95ff781598a3b (diff) | |
| download | openssl-8c10e1b660be1286439e15c9a955461f25b53616.zip openssl-8c10e1b660be1286439e15c9a955461f25b53616.tar.gz openssl-8c10e1b660be1286439e15c9a955461f25b53616.tar.bz2 | |
Clean up macro definitions of openssl_fdset() in apps.h and sockets.h
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/4277)
| -rw-r--r-- | apps/include/apps.h | 8 | ||||
| -rw-r--r-- | include/internal/sockets.h | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/apps/include/apps.h b/apps/include/apps.h index 7789bd2..a8da7ac 100644 --- a/apps/include/apps.h +++ b/apps/include/apps.h @@ -12,6 +12,7 @@ # include "e_os.h" /* struct timeval for DTLS */ # include "internal/nelem.h" +# include "internal/sockets.h" /* for openssl_fdset() */ # include <assert.h> # include <sys/types.h> @@ -35,13 +36,6 @@ # include "fmt.h" # include "platform.h" -/* also in include/internal/sockets.h */ -# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE) -# define openssl_fdset(a,b) FD_SET((unsigned int)a, b) -# else -# define openssl_fdset(a,b) FD_SET(a, b) -# endif - /* * quick macro when you need to pass an unsigned char instead of a char. * this is true for some implementations of the is*() functions, for diff --git a/include/internal/sockets.h b/include/internal/sockets.h index e770851..6d17363 100644 --- a/include/internal/sockets.h +++ b/include/internal/sockets.h @@ -154,9 +154,9 @@ struct servent *PASCAL getservbyname(const char *, const char *); /* also in apps/include/apps.h */ # if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE) -# define openssl_fdset(a,b) FD_SET((unsigned int)a, b) +# define openssl_fdset(a, b) FD_SET((unsigned int)(a), b) # else -# define openssl_fdset(a,b) FD_SET(a, b) +# define openssl_fdset(a, b) FD_SET(a, b) # endif #endif |