4.15

diff --git a/Changes b/Changes
index 0e3724a7a1918feee8e27d13e805327bb72e1e24..00a03f135c82fa4459b7aeeb6709b08ff123e41d 100644 (file)
--- a/Changes
+++ b/Changes
@@ -6,13 +6,14 @@ TODO: faq, process a thing in each iteration
 TODO: dbeugging tips, ev_verify, ev_init twice
 TODO: ev_break for immediate exit (EVBREAK_NOW?)
 TODO: ev_feed_child_event
-
 TODO: document the special problem of signals around fork.
 TODO: store pid for each signal
 TODO: document file descriptor usage per loop
 TODO: store loop pid_t and compare isndie signal handler,store 1 for same, 2 for differign pid, clean up in loop_fork
 TODO: embed watchers need updating when fd changes
 TODO: document portbaility requirements for atomic pointer access
+
+4.15 Fri Mar  1 12:04:50 CET 2013
         - destroying a non-default loop would stop the global waitpid
           watcher (Denis Bilenko).
        - queueing pending watchers of higher priority from a watcher now invokes

diff --git a/configure.ac b/configure.ac
index 60e5bdaea9d4e938fb3a0068e2183cad7220c33d..80b18cbf9047e011776eaa2a9c7c4969a1953a0a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ orig_CFLAGS="$CFLAGS"
 
 AC_CONFIG_SRCDIR([ev_epoll.c])
 
-AM_INIT_AUTOMAKE(libev,4.11) dnl also update ev.h!
+AM_INIT_AUTOMAKE(libev,4.15) dnl also update ev.h!
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 

diff --git a/ev.c b/ev.c
index a03a40fb8693bae2fa760074af33838afe11a712..e5bd5abd9e86d5ef084d14986d04af674af65fa7 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -517,7 +517,7 @@ struct signalfd_siginfo
 #define ECB_H
 
 /* 16 bits major, 16 bits minor */
-#define ECB_VERSION 0x00010002
+#define ECB_VERSION 0x00010003
 
 #ifdef _WIN32
   typedef   signed char   int8_t;
@@ -551,6 +551,15 @@ struct signalfd_siginfo
   #endif
 #endif
 
+/* work around x32 idiocy by defining proper macros */
+#if __x86_64 || _M_AMD64
+  #if __ILP32
+    #define ECB_AMD64_X32 1
+  #else
+    #define ECB_AMD64 1
+  #endif
+#endif
+
 /* many compilers define _GNUC_ to some versions but then only implement
  * what their idiot authors think are the "more important" extensions,
  * causing enormous grief in return for some better fake benchmark numbers.

diff --git a/ev.h b/ev.h
index 484161dd2ebca19487659fb409cbc740af23547a..c5d582e05e569e2fe3eb48acb3485b96fcd68e6c 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -205,7 +205,7 @@ struct ev_loop;
 /*****************************************************************************/
 
 #define EV_VERSION_MAJOR 4
-#define EV_VERSION_MINOR 11
+#define EV_VERSION_MINOR 15
 
 /* eventmask, revents, events... */
 enum {