X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Futil.h;h=869388fe298fa6101dae494aa51f537a79bd64df;hb=fe548d263d477a745dfa5057f540cc5c35ecce89;hp=8e9d695ed090a1cbd35ad75e37da425be7663a7b;hpb=26c7f8bb32e4a32001d409f1693e0df016270ed5;p=wimlib

diff --git a/include/wimlib/util.h b/include/wimlib/util.h
index 8e9d695e..869388fe 100644
--- a/include/wimlib/util.h
+++ b/include/wimlib/util.h
@@ -5,7 +5,6 @@
 #include "wimlib/compiler.h"
 
 #include <stdio.h>
-#include <stddef.h>
 
 #ifndef min
 #define min(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); \
@@ -53,7 +52,6 @@
  * places when large temporary buffers are needed).  */
 #define STACK_MAX 32768
 
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
 extern void *
 wimlib_malloc(size_t) _malloc_attribute;
 
@@ -74,22 +72,12 @@ wimlib_wcsdup(const wchar_t *str) _malloc_attribute;
 extern char *
 wimlib_strdup(const char *str) _malloc_attribute;
 
-#  define	MALLOC	wimlib_malloc
-#  define	FREE	wimlib_free_memory
-#  define	REALLOC	wimlib_realloc
-#  define	CALLOC	wimlib_calloc
-#  define	STRDUP	wimlib_strdup
-#  define	WCSDUP  wimlib_wcsdup
-#else /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
-#  include <stdlib.h>
-#  include <string.h>
-#  define	MALLOC	malloc
-#  define	FREE	free
-#  define	REALLOC	realloc
-#  define	CALLOC	calloc
-#  define	STRDUP	strdup
-#  define       WCSDUP  wcsdup
-#endif /* !ENABLE_CUSTOM_MEMORY_ALLOCATOR */
+#define	MALLOC	wimlib_malloc
+#define	FREE	wimlib_free_memory
+#define	REALLOC	wimlib_realloc
+#define	CALLOC	wimlib_calloc
+#define	STRDUP	wimlib_strdup
+#define	WCSDUP  wimlib_wcsdup
 
 extern void *
 memdup(const void *mem, size_t size) _malloc_attribute;
@@ -99,7 +87,9 @@ extern void *
 mempcpy(void *dst, const void *src, size_t n);
 #endif
 
-/* util.c */
+extern size_t
+utf16le_strlen(const utf16lechar *s);
+
 extern void
 randomize_byte_array(u8 *p, size_t n);