X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.h;h=b56fa4fa33e487350a249607a65b5723d3f0c132;hp=3db022a11b86ff608cf3a15f505b5e27b44d8254;hb=2a33c303e30fd740f740e21632fd06b9e414b0c7;hpb=e78f0d2a97781f3c5f242417c747fdc4eef43cdf

diff --git a/src/util.h b/src/util.h
index 3db022a1..b56fa4fa 100644
--- a/src/util.h
+++ b/src/util.h
@@ -9,7 +9,11 @@
 #include "config.h"
 
 #ifdef __GNUC__
-#	define WIMLIBAPI __attribute__((visibility("default")))
+#	if defined(__CYGWIN__) || defined(__WIN32__)
+#		define WIMLIBAPI __declspec(dllexport)
+#	else
+#		define WIMLIBAPI __attribute__((visibility("default")))
+#	endif
 #	define ALWAYS_INLINE inline __attribute__((always_inline))
 #	define PACKED __attribute__((packed))
 #	define FORMAT(type, format_str, args_start) \
@@ -85,21 +89,29 @@ 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 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, ...)
+#	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)
@@ -115,13 +127,13 @@ extern void wimlib_warning(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
@@ -162,6 +174,19 @@ extern char *wimlib_strdup(const char *str);
 
 
 /* encoding.c */
+
+#if defined(WITH_NTFS_3G) || defined(__WIN32__)
+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);