From b67fc6cf99613e491218c9386a248d03344b5ee6 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Thu, 8 Aug 2013 21:54:47 +0200
Subject: [PATCH] libev: Updated (4.11 -> 4.15)

---
 develop/libev/libev.desc    |  6 +++---
 develop/libev/realloc.patch | 38 ++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/develop/libev/libev.desc b/develop/libev/libev.desc
index c55ec1961..99781e10e 100644
--- a/develop/libev/libev.desc
+++ b/develop/libev/libev.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../libev/libev.desc
-[COPY] Copyright (C) 2008 - 2012 The OpenSDE Project
+[COPY] Copyright (C) 2008 - 2013 The OpenSDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
 [COPY]
@@ -34,7 +34,7 @@
 
 [L] BSD
 [S] Stable
-[V] 4.11
+[V] 4.15
 [P] X -?---5---9 144.000
 
-[D] 244398005 libev-4.11.tar.gz http://dist.schmorp.de/libev/
+[D] 763480378 libev-4.15.tar.gz http://dist.schmorp.de/libev/
diff --git a/develop/libev/realloc.patch b/develop/libev/realloc.patch
index 6054c8e1e..5a6b672b9 100644
--- a/develop/libev/realloc.patch
+++ b/develop/libev/realloc.patch
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../libev/realloc.patch
-# Copyright (C) 2008 - 2012 The OpenSDE Project
+# Copyright (C) 2008 - 2013 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -14,38 +14,38 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
---- libev-4.11/ev.c.orig	2012-02-04 20:09:52.000000000 +0100
-+++ libev-4.11/ev.c	2012-05-09 14:52:44.986990152 +0200
-@@ -1132,7 +1132,7 @@
+--- a/ev.c	2013-03-01 12:10:48.000000000 +0100
++++ b/ev.c	2013-08-08 16:55:06.144756967 +0200
+@@ -1411,7 +1411,7 @@
  }
  
  static void *
--ev_realloc_emul (void *ptr, long size)
-+ev_realloc_emul (void *ptr, size_t size)
+-ev_realloc_emul (void *ptr, long size) EV_THROW
++ev_realloc_emul (void *ptr, size_t size) EV_THROW
  {
- #if __GLIBC__
-   return realloc (ptr, size);
-@@ -1150,10 +1150,10 @@
- #endif
+   /* some systems, notably openbsd and darwin, fail to properly
+    * implement realloc (x, 0) (as required by both ansi c-89 and
+@@ -1427,10 +1427,10 @@
+   return 0;
  }
  
--static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
-+static void *(*alloc)(void *ptr, size_t size) = ev_realloc_emul;
+-static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
++static void *(*alloc)(void *ptr, size_t size) EV_THROW = ev_realloc_emul;
  
  void ecb_cold
--ev_set_allocator (void *(*cb)(void *ptr, long size))
-+ev_set_allocator (void *(*cb)(void *ptr, size_t size))
+-ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
++ev_set_allocator (void *(*cb)(void *ptr, size_t size) EV_THROW) EV_THROW
  {
    alloc = cb;
  }
---- libev-4.11/ev.h.orig	2012-02-04 19:54:04.000000000 +0100
-+++ libev-4.11/ev.h	2012-05-09 14:53:22.823653291 +0200
-@@ -530,7 +530,7 @@
+--- a/ev.h	2013-03-01 12:05:29.000000000 +0100
++++ b/ev.h	2013-08-08 16:57:38.560245532 +0200
+@@ -536,7 +536,7 @@
   * or take some potentially destructive action.
   * The default is your system realloc function.
   */
--EV_API_DECL void ev_set_allocator (void *(*cb)(void *ptr, long size));
-+EV_API_DECL void ev_set_allocator (void *(*cb)(void *ptr, size_t size));
+-EV_API_DECL void ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW;
++EV_API_DECL void ev_set_allocator (void *(*cb)(void *ptr, size_t size) EV_THROW) EV_THROW;
  
  /* set the callback function to call on a
   * retryable syscall error