Merge remote-tracking branch 'IOMultiplexer.git/master' into development

diff --combined src/IOHandler.h
index 23c411c688a968c9c12102e60bdc378f5af7f6a2,b0a6c6bc50c9e0e54c0981e45c25a4fb153a7bae..ea7b44396a6d8ea481338f63286e18a5021a982b
--- 1/src/IOHandler.h
--- 2/src/IOHandler.h
+++ b/src/IOHandler.h
@@@ -16,7 -16,6 +16,7 @@@
   */
  #ifndef _IOHandler_h
  #define _IOHandler_h
 +#include "../config.h" /* configure script autogenerated */
  #include <stddef.h>
  #include <sys/time.h> /* struct timeval */
  
@@@ -118,5 -117,6 +118,6 @@@ void iohandler_update(struct IODescript
  void iohandler_set_timeout(struct IODescriptor *iofd, struct timeval *timeout);
  
  void iohandler_poll();
+ void iohandler_poll_timeout(struct timeval timeout);
  
  #endif