X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Ferror.h;h=a36f8028c0ffde1100d4e9366ce36c50c0a45f52;hb=629719b7d5cad7fc6f2eca7ca11cb99100ed8764;hp=8dd48c180c29091bf6a1d4dfce00f01cd7f55fdf;hpb=fced769402ff6ef0bf75fe9e4dcb2880891469e0;p=wimlib

diff --git a/include/wimlib/error.h b/include/wimlib/error.h
index 8dd48c18..a36f8028 100644
--- 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;
 }
@@ -42,7 +30,7 @@ extern void
 wimlib_warning_with_errno(const tchar *format, ...)
 		_format_attribute(printf, 1, 2) _cold_attribute;
 #  define ERROR(format, ...)			wimlib_error(T(format), ## __VA_ARGS__)
-#  define ERROR_WITH_ERRNO(format, ...) 	wimlib_error_with_errno(T(format), ## __VA_ARGS__)
+#  define ERROR_WITH_ERRNO(format, ...)		wimlib_error_with_errno(T(format), ## __VA_ARGS__)
 #  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;
@@ -68,16 +56,10 @@ extern void
 wimlib_debug(const tchar *file, int line, const char *func,
 	     const tchar *format, ...);
 #  define DEBUG(format, ...) \
-	 	wimlib_debug(T(__FILE__), __LINE__, __func__, T(format), ## __VA_ARGS__)
+		wimlib_debug(T(__FILE__), __LINE__, __func__, T(format), ## __VA_ARGS__)
 
 #else
 #  define DEBUG(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__)
 #endif /* !ENABLE_DEBUG */
 
-#ifdef ENABLE_MORE_DEBUG
-#  define DEBUG2(format, ...) DEBUG(format, ## __VA_ARGS__)
-#else
-#  define DEBUG2(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__)
-#endif /* !ENABLE_MORE_DEBUG */
-
 #endif /* _WIMLIB_ERROR_H */