From 45920dd879937605783e2a764ba29c152686b21d Mon Sep 17 00:00:00 2001
From: root <root>
Date: Tue, 6 Jan 2009 19:57:32 +0000
Subject: *** empty log message ***

---
 Changes | 3 +++
 ev.h    | 9 +++++----
 event.c | 4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Changes b/Changes
index 7cb8d4a..54659bf 100644
--- a/Changes
+++ b/Changes
@@ -14,6 +14,9 @@ Revision history for libev, a high-performance and full-featured event loop.
           should return fantasy port numbers.
         - include "libev" all assertion messages for potentially
           clearer diagnostics.
+        - event_get_version (libevent compatibility) returned
+          a useless string instead of the expected version string
+          (patch by W.C.A. Wijngaards).
 
 3.51 Wed Dec 24 23:00:11 CET 2008
         - fix a bug where an inotify watcher was added twice, causing
diff --git a/ev.h b/ev.h
index 01a1155..da25123 100644
--- a/ev.h
+++ b/ev.h
@@ -167,9 +167,10 @@ struct ev_loop;
 
 /*
  * struct member types:
- * private: you can look at them, but not change them, and they might not mean anything to you.
- * ro: can be read anytime, but only changed when the watcher isn't active
- * rw: can be read and modified anytime, even when the watcher is active
+ * private: you may look at them, but not change them,
+ *          and they might not mean anything to you.
+ * ro: can be read anytime, but only changed when the watcher isn't active.
+ * rw: can be read and modified anytime, even when the watcher is active.
  *
  * some internal details that might be helpful for debugging:
  *
@@ -178,7 +179,7 @@ struct ev_loop;
  *           or the array index + 1 (most other watchers)
  *           or simply 1 for watchers that aren't in some array.
  * pending is either 0, in which case the watcher isn't,
- *            or the array index + 1 in the pendings array.
+ *           or the array index + 1 in the pendings array.
  */
 
 /* shared by all watchers */
diff --git a/event.c b/event.c
index b8a8e17..1bcd7a0 100644
--- a/event.c
+++ b/event.c
@@ -79,10 +79,12 @@ ev_tv_get (struct timeval *tv)
     return -1.;
 }
 
-#define EVENT_VERSION(a,b) # a "." # b
+#define EVENT_STRINGIFY(s) # s
+#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b)
 
 const char *event_get_version (void)
 {
+  /* returns ABI, not API or library, version */
   return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
 }
 
-- 
cgit v1.2.3