Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 18 insertions, 17 deletions

diff --git a/src/i_poll_events.hpp b/src/i_poll_events.hpp
index 6d474b2..fa9fb25 100644
--- a/src/i_poll_events.hpp
+++ b/src/i_poll_events.hpp
@@ -1,20 +1,21 @@
 /*
-Copyright (c) 2007-2010 iMatix Corporation
- 
-This file is part of 0MQ.
- 
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the Lesser GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
- 
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-Lesser GNU General Public License for more details.
- 
-You should have received a copy of the Lesser GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+    Copyright (c) 2007-2011 iMatix Corporation
+    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
  
 #ifndef __ZMQ_I_POLL_EVENTS_HPP_INCLUDED__
@@ -37,7 +38,7 @@ namespace zmq
         virtual void out_event () = 0;
  
         // Called when timer expires.
-        virtual void timer_event () = 0;
+        virtual void timer_event (int id_) = 0;
     };
  
 }