Windows native build

[wimlib] / src / util.h

diff --git a/src/util.h b/src/util.h
index 4f4056660e282dd2ca457584acdc7484be597b42..b56fa4fa33e487350a249607a65b5723d3f0c132 100644 (file)
--- 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,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;
@@ -99,8 +108,6 @@ 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
@@ -120,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
@@ -168,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;