Browse Source

libev: rediffed realloc.patch against version 4.11

user/chris/next/shadow
Christian Wiese 13 years ago
parent
commit
e088359c2a
  1. 28
      develop/libev/realloc.patch

28
develop/libev/realloc.patch

@ -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 The OpenSDE Project # Copyright (C) 2008 - 2012 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 ---
--- ./ev.c.orig 2008-09-27 15:15:14.000000000 +0000 --- libev-4.11/ev.c.orig 2012-02-04 20:09:52.000000000 +0100
+++ ./ev.c 2008-09-27 15:17:31.000000000 +0000 +++ libev-4.11/ev.c 2012-05-09 14:52:44.986990152 +0200
@@ -399,7 +399,7 @@ @@ -1132,7 +1132,7 @@
} }
static void * static void *
-ev_realloc_emul (void *ptr, long size) -ev_realloc_emul (void *ptr, long size)
+ev_realloc_emul (void *ptr, size_t size) +ev_realloc_emul (void *ptr, size_t size)
{ {
/* some systems, notably openbsd and darwin, fail to properly #if __GLIBC__
* implement realloc (x, 0) (as required by both ansi c-98 and return realloc (ptr, size);
@@ -413,10 +413,10 @@ @@ -1150,10 +1150,10 @@
return 0; #endif
} }
-static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; -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, size_t size) = ev_realloc_emul;
void void ecb_cold
-ev_set_allocator (void *(*cb)(void *ptr, long size)) -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, size_t size))
{ {
alloc = cb; alloc = cb;
} }
--- ./ev.h.orig 2008-09-27 15:15:10.000000000 +0000 --- libev-4.11/ev.h.orig 2012-02-04 19:54:04.000000000 +0100
+++ ./ev.h 2008-09-27 15:15:56.000000000 +0000 +++ libev-4.11/ev.h 2012-05-09 14:53:22.823653291 +0200
@@ -415,7 +415,7 @@ @@ -530,7 +530,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.
*/ */
-void ev_set_allocator (void *(*cb)(void *ptr, long size)); -EV_API_DECL void ev_set_allocator (void *(*cb)(void *ptr, long size));
+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));
/* set the callback function to call on a /* set the callback function to call on a
* retryable syscall error * retryable syscall error

Loading…
Cancel
Save