babl r296 - in trunk: . babl

[martinn svn gnome org]

Author: martinn
Date: Sun Mar 23 18:11:11 2008
New Revision: 296
URL: http://svn.gnome.org/viewvc/babl?rev=296&view=rev

Log:
2008-03-23  Martin Nordholts  <martinn svn gnome org>

	* babl/babl-memory.[ch]: typedef:ed BABL free and malloc function
	pointers.


Modified:
   trunk/ChangeLog
   trunk/babl/babl-memory.c
   trunk/babl/babl-memory.h

Modified: trunk/babl/babl-memory.c
==============================================================================
--- trunk/babl/babl-memory.c	(original)
+++ trunk/babl/babl-memory.c	Sun Mar 23 18:11:11 2008
@@ -21,20 +21,20 @@
 #include <string.h>
 #include "babl-internal.h"
 
-static void *(*malloc_f)(size_t size) = malloc;
-static void  (*free_f)(void *ptr)     = free;
+static BablMallocFunc malloc_f = malloc;
+static BablFreeFunc   free_f   = free;
 
 static void *first_malloc_used = NULL;
 static void *first_free_used   = NULL;
 
 void
-babl_set_malloc (void *(*malloc_function)(size_t size))
+babl_set_malloc (BablMallocFunc malloc_function)
 {
   malloc_f = malloc_function;
 }
 
 void
-babl_set_free (void (*free_function)(void *ptr))
+babl_set_free (BablFreeFunc free_function)
 {
   free_f = free_function;
 }

Modified: trunk/babl/babl-memory.h
==============================================================================
--- trunk/babl/babl-memory.h	(original)
+++ trunk/babl/babl-memory.h	Sun Mar 23 18:11:11 2008
@@ -19,8 +19,13 @@
 #ifndef _BABL_MEMORY_H
 #define _BABL_MEMORY_H
 
-void   babl_set_malloc    (void     *(*malloc_function) (size_t  size));
-void   babl_set_free      (void      (*free)            (void   *ptr));
+
+typedef void * (* BablMallocFunc) (size_t size);
+typedef void   (* BablFreeFunc)   (void  *ptr);
+
+
+void   babl_set_malloc    (BablMallocFunc malloc_function);
+void   babl_set_free      (BablFreeFunc   free_function);
 int    babl_memory_sanity (void);
 
 void * babl_malloc        (size_t      size);