X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.h;h=0979d98f6e214755eabf977edd21abda68382243;hp=08b15636acdcc66ae0c440755bfc45bf276ec13e;hb=7bde3fc590afbdef8f71cd7f8ccbd24172bffc63;hpb=ded522fd0a15d740354329c5066ebd3473563e57

diff --git a/src/util.h b/src/util.h
index 08b15636..0979d98f 100644
--- a/src/util.h
+++ b/src/util.h
@@ -44,7 +44,6 @@ typedef uint16_t u16;
 typedef uint32_t u32;
 typedef uint64_t u64;
 #endif
-typedef unsigned uint;
 
 #ifndef min
 #define min(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); \
@@ -132,6 +131,13 @@ extern void wimlib_warning(const char *format, ...)
 #	define wimlib_assert(expr)
 #endif
 
+#ifdef ENABLE_MORE_ASSERTIONS
+#define wimlib_assert2(expr) wimlib_assert(expr)
+#else
+#define wimlib_assert2(expr)
+#endif
+
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 
 #ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
 extern void *(*wimlib_malloc_func)(size_t);
@@ -156,6 +162,19 @@ extern char *wimlib_strdup(const char *str);
 
 
 /* encoding.c */
+
+#ifdef WITH_NTFS_3G
+static inline int iconv_global_init()
+{
+	return 0;
+}
+
+static inline void iconv_global_cleanup() { }
+#else
+extern int iconv_global_init();
+extern void iconv_global_cleanup();
+#endif
+
 extern int utf16_to_utf8(const char *utf16_str, size_t utf16_nbytes,
 			 char **utf8_str_ret, size_t *utf8_nbytes_ret);