|
|
@ -2,7 +2,7 @@ |
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# Filename: package/.../libev/realloc.patch
|
|
|
|
# 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.
|
|
|
|
# More information can be found in the files COPYING and README.
|
|
|
|
#
|
|
|
|
#
|
|
|
@ -14,38 +14,38 @@ |
|
|
|
# version.
|
|
|
|
# version.
|
|
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
|
|
|
|
|
|
|
|
--- libev-4.11/ev.c.orig 2012-02-04 20:09:52.000000000 +0100
|
|
|
|
--- a/ev.c 2013-03-01 12:10:48.000000000 +0100
|
|
|
|
+++ libev-4.11/ev.c 2012-05-09 14:52:44.986990152 +0200
|
|
|
|
+++ b/ev.c 2013-08-08 16:55:06.144756967 +0200
|
|
|
|
@@ -1132,7 +1132,7 @@
|
|
|
|
@@ -1411,7 +1411,7 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void *
|
|
|
|
static void *
|
|
|
|
-ev_realloc_emul (void *ptr, long size)
|
|
|
|
-ev_realloc_emul (void *ptr, long size) EV_THROW
|
|
|
|
+ev_realloc_emul (void *ptr, size_t size)
|
|
|
|
+ev_realloc_emul (void *ptr, size_t size) EV_THROW
|
|
|
|
{
|
|
|
|
{
|
|
|
|
#if __GLIBC__
|
|
|
|
/* some systems, notably openbsd and darwin, fail to properly
|
|
|
|
return realloc (ptr, size);
|
|
|
|
* implement realloc (x, 0) (as required by both ansi c-89 and
|
|
|
|
@@ -1150,10 +1150,10 @@
|
|
|
|
@@ -1427,10 +1427,10 @@
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-static void *(*alloc)(void *ptr, long 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_realloc_emul;
|
|
|
|
+static void *(*alloc)(void *ptr, size_t size) EV_THROW = ev_realloc_emul;
|
|
|
|
|
|
|
|
|
|
|
|
void ecb_cold
|
|
|
|
void ecb_cold
|
|
|
|
-ev_set_allocator (void *(*cb)(void *ptr, long 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_set_allocator (void *(*cb)(void *ptr, size_t size) EV_THROW) EV_THROW
|
|
|
|
{
|
|
|
|
{
|
|
|
|
alloc = cb;
|
|
|
|
alloc = cb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
--- libev-4.11/ev.h.orig 2012-02-04 19:54:04.000000000 +0100
|
|
|
|
--- a/ev.h 2013-03-01 12:05:29.000000000 +0100
|
|
|
|
+++ libev-4.11/ev.h 2012-05-09 14:53:22.823653291 +0200
|
|
|
|
+++ b/ev.h 2013-08-08 16:57:38.560245532 +0200
|
|
|
|
@@ -530,7 +530,7 @@
|
|
|
|
@@ -536,7 +536,7 @@
|
|
|
|
* or take some potentially destructive action.
|
|
|
|
* or take some potentially destructive action.
|
|
|
|
* The default is your system realloc function.
|
|
|
|
* 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, long size) EV_THROW) EV_THROW;
|
|
|
|
+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, size_t size) EV_THROW) EV_THROW;
|
|
|
|
|
|
|
|
|
|
|
|
/* set the callback function to call on a
|
|
|
|
/* set the callback function to call on a
|
|
|
|
* retryable syscall error
|
|
|
|
* retryable syscall error
|
|
|
|