*** empty log message ***

diff --git a/Changes b/Changes
index d623f138d9782c423acd1e8440e8324172debdf5..a062cd7c373f9d0f4669bf2e02ffd363c8556542 100644 (file)
--- a/Changes
+++ b/Changes
@@ -15,6 +15,8 @@ TODO: document portability requirements for atomic pointer access
 TODO: possible cb aliasing?
 TODO: document requirements for function pointers and calling conventions.
 
+       - ev.h wasn't valid C++ anymore, which tripped compilers other than
+          clang, msvc or gcc (analyzed by Raphael 'kena' Poss).
        - when not using autoconf, tighten the check for clock_gettime and related
           functionality.
 

diff --git a/ev.c b/ev.c
index f8a1617ae9d698a1d9bc50419ba3e3d5760c94de..7b1089b7939fa013414461819494c618210ad6fc 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -2615,7 +2615,7 @@ ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW
 }
 
 void
-ev_set_loop_release_cb (EV_P_ ev_loop_callback_nothrow release, ev_loop_callback_nothrow acquire) EV_THROW
+ev_set_loop_release_cb (EV_P_ ev_loop_callback release EV_THROW, ev_loop_callback acquire EV_THROW) EV_THROW
 {
   release_cb = release;
   acquire_cb = acquire;

diff --git a/ev.h b/ev.h
index 13d22ed18999c370c60d760b718613c833717b7f..432d06d40cfa1cbea1a4ea7d1900f5fdb1f6f24e 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -660,8 +660,7 @@ EV_API_DECL void ev_set_userdata (EV_P_ void *data) EV_THROW;
 EV_API_DECL void *ev_userdata (EV_P) EV_THROW;
 typedef void (*ev_loop_callback)(EV_P);
 EV_API_DECL void ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW;
-typedef void (*ev_loop_callback_nothrow)(EV_P) EV_THROW;
-EV_API_DECL void ev_set_loop_release_cb (EV_P_ ev_loop_callback_nothrow release, ev_loop_callback_nothrow acquire) EV_THROW;
+EV_API_DECL void ev_set_loop_release_cb (EV_P_ ev_loop_callback release EV_THROW, ev_loop_callback acquire EV_THROW) EV_THROW;
 
 EV_API_DECL unsigned int ev_pending_count (EV_P) EV_THROW; /* number of pending events, if any */
 EV_API_DECL void ev_invoke_pending (EV_P); /* invoke all pending watchers */

diff --git a/ev_vars.h b/ev_vars.h
index 98f77183b19bd5d9d79e719847e3e660a81f4e29..6c1a0def6a5e9e689177b24e7b558d4ea789c544 100644 (file)
--- a/ev_vars.h
+++ b/ev_vars.h
@@ -194,8 +194,8 @@ VARx(unsigned int, loop_count) /* total number of loop iterations/blocks */
 VARx(unsigned int, loop_depth) /* #ev_run enters - #ev_run leaves */
 
 VARx(void *, userdata)
-VAR (release_cb, ev_loop_callback_nothrow release_cb)
-VAR (acquire_cb, ev_loop_callback_nothrow acquire_cb)
+VAR (release_cb, ev_loop_callback release_cb EV_THROW)
+VAR (acquire_cb, ev_loop_callback acquire_cb EV_THROW)
 VAR (invoke_cb , ev_loop_callback invoke_cb)
 #endif