summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2012-05-09 16:50:23 +0000
committerroot <root>2012-05-09 16:50:23 +0000
commit099c2c637f9994af11b91e6edfc3fff676844893 (patch)
tree443864b68f760e5233e3615d4b5aae61c94b13d1
parent4b23e7a7de3bed96b949ea1c0c85cd21006f2385 (diff)
*** empty log message ***
-rw-r--r--ev++.h6
-rw-r--r--ev.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/ev++.h b/ev++.h
index c5a0896..283f6eb 100644
--- a/ev++.h
+++ b/ev++.h
@@ -286,7 +286,7 @@ namespace ev {
template<class K, void (K::*method)(int)>
static void method_thunk (int revents, void *arg)
{
- static_cast<K *>(arg)->*method
+ (static_cast<K *>(arg)->*method)
(revents);
}
@@ -300,7 +300,7 @@ namespace ev {
template<class K, void (K::*method)()>
static void method_noargs_thunk (int revents, void *arg)
{
- static_cast<K *>(arg)->*method
+ (static_cast<K *>(arg)->*method)
();
}
@@ -513,7 +513,7 @@ namespace ev {
void feed_event (int revents) throw ()
{
- ev_feed_event (EV_A_ static_cast<const ev_watcher *>(this), revents);
+ ev_feed_event (EV_A_ static_cast<ev_watcher *>(this), revents);
}
};
diff --git a/ev.c b/ev.c
index 3a9997b..57b2798 100644
--- a/ev.c
+++ b/ev.c
@@ -203,8 +203,8 @@
#else
# include <io.h>
# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
# include <winsock2.h>
+# include <windows.h>
# ifndef EV_SELECT_IS_WINSOCKET
# define EV_SELECT_IS_WINSOCKET 1
# endif