Clean up headers

[wimlib] / src / util.h

diff --git a/src/util.h b/src/util.h
index b79490e8ad4c3ff180105ea3c353c43af6bccd64..c51fc710a8615a414607da5dcec3a95e18e5f54e 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -89,6 +89,11 @@ typedef uint64_t u64;
 /* Used for buffering FILE IO in a few places */
 #define BUFFER_SIZE 4096
 
+static inline void FORMAT(printf, 1, 2)
+dummy_printf(const char *format, ...)
+{
+}
+
 #ifdef ENABLE_ERROR_MESSAGES
 extern void wimlib_error(const char *format, ...)
                FORMAT(printf, 1, 2) COLD;
@@ -103,12 +108,10 @@ extern void wimlib_warning_with_errno(const char *format, ...)
 #      define WARNING                  wimlib_warning
 #      define WARNING_WITH_ERRNO       wimlib_warning
 #else
-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
+#      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)
@@ -124,13 +127,13 @@ dummy_printf(const char *format, ...) { }
        })
 
 #else
-#      define DEBUG(format, ...)
+#      define DEBUG(format, ...) dummy_printf(format, ## __VA_ARGS__)
 #endif /* ENABLE_DEBUG || ENABLE_MORE_DEBUG */
 
 #ifdef ENABLE_MORE_DEBUG
 #      define DEBUG2(format, ...) DEBUG(format, ## __VA_ARGS__)
 #else
-#      define DEBUG2(format, ...)
+#      define DEBUG2(format, ...) dummy_printf(format, ## __VA_ARGS__)
 #endif /* ENABLE_DEBUG */
 
 #ifdef ENABLE_ASSERTIONS
@@ -172,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;