resource.c: Make extract_chunk_to_fd() static

[wimlib] / include / wimlib / error.h

diff --git a/include/wimlib/error.h b/include/wimlib/error.h
index 522264021d3089bf80614c1a1000abc4f4067b60..9657eda8ad457c631957dbecb1e860b7f8d91049 100644 (file)
--- a/include/wimlib/error.h
+++ b/include/wimlib/error.h
@@ -7,20 +7,8 @@
 
 #include <stdio.h>
 
-#ifdef __WIN32__
-#  define wimlib_fprintf fwprintf
-#  define wimlib_printf         wprintf
-#else /* __WIN32__ */
-extern int
-wimlib_fprintf(FILE *fp, const tchar *format, ...) _format_attribute(printf, 2, 3);
-
-extern int
-wimlib_printf(const tchar *format, ...) _format_attribute(printf, 1, 2);
-#endif /* !__WIN32__ */
-
-
-static inline int
-dummy_tprintf(const tchar *format, ...) _format_attribute(printf, 1, 2)
+static inline int _format_attribute(printf, 1, 2)
+dummy_tprintf(const tchar *format, ...)
 {
        return 0;
 }
@@ -46,8 +34,10 @@ wimlib_warning_with_errno(const tchar *format, ...)
 #  define WARNING(format, ...)                 wimlib_warning(T(format), ## __VA_ARGS__)
 #  define WARNING_WITH_ERRNO(format, ...)      wimlib_warning_with_errno(T(format), ## __VA_ARGS__)
 extern bool wimlib_print_errors;
+extern FILE *wimlib_error_file;
 #else /* ENABLE_ERROR_MESSAGES */
 #  define wimlib_print_errors 0
+#  define wimlib_error_file NULL
 #  define ERROR(format, ...)                   dummy_tprintf(T(format), ## __VA_ARGS__)
 #  define ERROR_WITH_ERRNO(format, ...)                dummy_tprintf(T(format), ## __VA_ARGS__)
 #  define WARNING(format, ...)                 dummy_tprintf(T(format), ## __VA_ARGS__)