Clean up headers

[wimlib] / src / util.h

diff --git a/src/util.h b/src/util.h
index 2dc794370ad3c58e2a00915cf07bcb04d75099ad..c51fc710a8615a414607da5dcec3a95e18e5f54e 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -108,10 +108,10 @@ extern void wimlib_warning_with_errno(const char *format, ...)
 #      define WARNING                  wimlib_warning
 #      define WARNING_WITH_ERRNO       wimlib_warning
 #else
-#      define ERROR(format, ...)               dummy_printf
-#      define ERROR_WITH_ERRNO(format, ...)    dummy_printf
-#      define WARNING(format, ...)             dummy_printf
-#      define WARNING_WITH_ERRNO(format, ...)  dummy_printf
+#      define ERROR(format, ...)               dummy_printf(format, ## __VA_ARGS__)
+#      define ERROR_WITH_ERRNO(format, ...)    dummy_printf(format, ## __VA_ARGS__)
+#      define WARNING(format, ...)             dummy_printf(format, ## __VA_ARGS__)
+#      define WARNING_WITH_ERRNO(format, ...)  dummy_printf(format, ## __VA_ARGS__)
 #endif /* ENABLE_ERROR_MESSAGES */
 
 #if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG)
@@ -175,7 +175,7 @@ extern char *wimlib_strdup(const char *str);
 
 /* encoding.c */
 
-#ifdef WITH_NTFS_3G
+#if defined(WITH_NTFS_3G) || defined(__WIN32__)
 static inline int iconv_global_init()
 {
        return 0;