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)

diff --git a/apps/include/apps.h b/apps/include/apps.h
index 7789bd2b0a1f1caf50a374db8ca52488c1468ad1..a8da7ac9f4ecfda21d2ec0ed5687813e23eecfcb 100644 (file)
--- 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 e7708516d8430e183f1fde62e2cd50399dfef23b..6d17363d9b2672658fa473c47eb3116ed5ebe094 100644 (file)
--- 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