X-Git-Url: http://git.imager.perl.org/imager.git/blobdiff_plain/8a00cb26c4b2428f46abee637b8a547f5ead3c55..1791cbdb538b0fa52224870468d824a6b6636508:/imio.h

diff --git a/imio.h b/imio.h
index 48a55d5c..6d5cea4f 100644
--- a/imio.h
+++ b/imio.h
@@ -3,36 +3,9 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
+#include "imconfig.h"
 #include "log.h"
 
-
-/* #define MALLOC_DEBUG */
-
-#ifdef IMAGER_DEBUG_MALLOC
-
-#define mymalloc(x) (mymalloc_file_line((x), __FILE__, __LINE__))
-#define myrealloc(x,y) (myrealloc_file_line((x),(y), __FILE__, __LINE__))
-#define myfree(x) (myfree_file_line((x), __FILE__, __LINE__))
-
-void  malloc_state       (void);
-void* mymalloc_file_line (size_t size, char* file, int line);
-void  myfree_file_line   (void *p, char*file, int line);
-void* myrealloc_file_line(void *p, size_t newsize, char* file,int line);
-void* mymalloc_comm      (int size, char *comm);
-void  bndcheck_all       (void);
-
-#else
-
-#define malloc_comm(a,b) (mymalloc(a))
-void  malloc_state(void);
-void* mymalloc(int size);
-void  myfree(void *p);
-void* myrealloc(void *p, size_t newsize);
-
-#endif /* IMAGER_MALLOC_DEBUG */
-
-
-
 typedef struct i_mempool {
   void **p;
   unsigned int alloc;
@@ -44,18 +17,11 @@ void  i_mempool_extend(i_mempool *mp);
 void *i_mempool_alloc(i_mempool *mp, size_t size);
 void  i_mempool_destroy(i_mempool *mp);
 
-
-
 #ifdef _MSC_VER
 #undef min
 #undef max
 #endif
 
-extern unsigned long i_utf8_advance(char const **p, int *len);
-
-/* XXX Shouldn't these go away? */
-
-int i_min(int a,int b);
-int i_max(int x,int y);
+extern unsigned long i_utf8_advance(char const **p, size_t *len);
 
 #endif