From: pk910 <philipp@zoelle1.de>
Date: Mon, 24 Sep 2012 14:53:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'IOMultiplexer.git/master' into development
X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=8ce78bf760720d04385821abba8f888b5de03140;hp=-c

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

8ce78bf760720d04385821abba8f888b5de03140
diff --combined src/IOHandler.h
index 23c411c,b0a6c6b..ea7b443
--- a/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