summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2013-12-19 18:57:12 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2013-12-19 18:57:12 +0000
commitd9feecd53cf5db9ad6bb3db07330e3c890a597fd (patch)
tree879e2a55da04281adb388d86f463b92c571efd0d
parentc6a4ecea1daad9f700d4f8a07cd902d1fa5635e0 (diff)
downloadATCD-d9feecd53cf5db9ad6bb3db07330e3c890a597fd.tar.gz
Thu Dec 19 18:57:09 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Handle_Set.h: Added check that FD_SETSIZE may not be bigger than __FD_SETSIZE. Thanks to Mike Ketchen <mketchen at broadsoft dot com> for suggesting this
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/THANKS1
-rw-r--r--ACE/ace/Handle_Set.h4
3 files changed, 12 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 1b782018d6c..fec105b7d5d 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec 19 18:57:09 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/Handle_Set.h:
+ Added check that FD_SETSIZE may not be bigger than __FD_SETSIZE.
+ Thanks to Mike Ketchen <mketchen at broadsoft dot com> for
+ suggesting this
+
Wed Dec 18 14:16:57 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* etc/ace_inet.doxygen:
diff --git a/ACE/THANKS b/ACE/THANKS
index 6065bbd7b77..bff4dc79496 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2383,6 +2383,7 @@ George Chen <ace dot gc dot pthzfoldr at gmail dot com>
Piotr Kow <pkow88776 at onet dot pl>
Yogesh Sharma <Yogesh dot Sharma at saabsensis dot com>
Mike McKnerney <michael dot mcknerney at baesystems dot com>
+Mike Ketchen <mketchen at broadsoft dot com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ACE/ace/Handle_Set.h b/ACE/ace/Handle_Set.h
index 9e65f51320e..67cab480248 100644
--- a/ACE/ace/Handle_Set.h
+++ b/ACE/ace/Handle_Set.h
@@ -30,6 +30,10 @@
# define ACE_FD_SETSIZE FD_SETSIZE
#endif /* ACE_FD_SETSIZE */
+#if defined(FD_SETSIZE) && defined(__FD_SETSIZE) && (FD_SETSIZE > __FD_SETSIZE)
+#error FD_SETSIZE definition is too large, please correct!
+#endif
+
#if !defined (ACE_DEFAULT_SELECT_REACTOR_SIZE)
# define ACE_DEFAULT_SELECT_REACTOR_SIZE ACE_FD_SETSIZE
#endif /* ACE_DEFAULT_SELECT_REACTOR_SIZE */