From 3960e9a02f4064422645b1e65230fe39708dd48f Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 21 Mar 2012 17:57:33 +0100 Subject: Update iOS app. --- fitz/fitz-internal.h | 16 ---------------- fitz/fitz.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'fitz') diff --git a/fitz/fitz-internal.h b/fitz/fitz-internal.h index ae64b89d..b47d984a 100644 --- a/fitz/fitz-internal.h +++ b/fitz/fitz-internal.h @@ -61,22 +61,6 @@ fz_unlock(fz_context *ctx, int lock) * Basic runtime and utility functions */ -/* - fz_malloc_struct: Allocate storage for a structure (with scavenging), - clear it, and (in Memento builds) tag the pointer as belonging to a - struct of this type. - - CTX: The context. - - STRUCT: The structure type. - - Returns a pointer to allocated (and cleared) structure. Throws - exception on failure to allocate. -*/ -/* alloc and zero a struct, and tag it for memento */ -#define fz_malloc_struct(CTX, STRUCT) \ - Memento_label(fz_calloc(CTX,1,sizeof(STRUCT)), #STRUCT) - /* Range checking atof */ float fz_atof(const char *s); diff --git a/fitz/fitz.h b/fitz/fitz.h index 55af47a0..1197a048 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -364,6 +364,22 @@ void *fz_malloc(fz_context *ctx, unsigned int size); */ void *fz_calloc(fz_context *ctx, unsigned int count, unsigned int size); +/* + fz_malloc_struct: Allocate storage for a structure (with scavenging), + clear it, and (in Memento builds) tag the pointer as belonging to a + struct of this type. + + CTX: The context. + + STRUCT: The structure type. + + Returns a pointer to allocated (and cleared) structure. Throws + exception on failure to allocate. +*/ +/* alloc and zero a struct, and tag it for memento */ +#define fz_malloc_struct(CTX, STRUCT) \ + Memento_label(fz_calloc(CTX,1,sizeof(STRUCT)), #STRUCT) + /* fz_malloc_array: Allocate a block of (non zeroed) memory (with scavenging). Equivalent to fz_calloc without the memory clearing. -- cgit v1.2.3