X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.h;h=4f4056660e282dd2ca457584acdc7484be597b42;hb=80224de6c2ff870ea36ff98b491223c674e4d57a;hp=15c68bc022f0d0e775267ccc03b850ea3abe5026;hpb=39f955331c7d8a5c3ff4ae44711f62581568f579;p=wimlib

diff --git a/src/util.h b/src/util.h
index 15c68bc0..4f405666 100644
--- a/src/util.h
+++ b/src/util.h
@@ -86,20 +86,25 @@ typedef uint64_t u64;
 #define BUFFER_SIZE 4096
 
 #ifdef ENABLE_ERROR_MESSAGES
-extern bool __wimlib_print_errors;
 extern void wimlib_error(const char *format, ...)
 		FORMAT(printf, 1, 2) COLD;
 extern void wimlib_error_with_errno(const char *format, ...)
 		FORMAT(printf, 1, 2) COLD;
 extern void wimlib_warning(const char *format, ...)
 		FORMAT(printf, 1, 2) COLD;
-#	define ERROR		wimlib_error
-#	define ERROR_WITH_ERRNO wimlib_error_with_errno
-#	define WARNING		wimlib_warning
+extern void wimlib_warning_with_errno(const char *format, ...)
+		FORMAT(printf, 1, 2) COLD;
+#	define ERROR			wimlib_error
+#	define ERROR_WITH_ERRNO 	wimlib_error_with_errno
+#	define WARNING			wimlib_warning
+#	define WARNING_WITH_ERRNO	wimlib_warning
 #else
-#	define ERROR(format, ...)
-#	define ERROR_WITH_ERRNO(format, ...)
-#	define WARNING(format, ...)
+static inline FORMAT(printf, 1, 2) void
+dummy_printf(const char *format, ...) { }
+#	define ERROR(format, ...)		dummy_printf
+#	define ERROR_WITH_ERRNO(format, ...)	dummy_printf
+#	define WARNING(format, ...)		dummy_printf
+#	define WARNING_WITH_ERRNO(format, ...)	dummy_printf
 #endif /* ENABLE_ERROR_MESSAGES */
 
 #if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG)
@@ -131,6 +136,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);
@@ -155,6 +167,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);