Fix when debugging enabled but error messages are not

[wimlib] / src / util.h

diff --git a/src/util.h b/src/util.h
index 4fd117dfb95d23e17b0d34715d8c9bb8743adadb..77c4b352a1d549320245b4a0be112ec859b7f737 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -52,9 +52,10 @@ typedef uint64_t u64;
 /* A pointer to 'mbchar' indicates a string of "multibyte characters" provided
  * in the default encoding of the user's locale, which may be "UTF-8",
  * "ISO-8859-1", "C", or any other ASCII-compatible encoding.
- * "ASCII-compatible" here means any encoding where all ASCII characters have
- * the same representation, and any non-ASCII character is represented as a
- * sequence of one or more bytes not already used by any ASCII character. */
+ * "ASCII-compatible" here means any encoding where all ASCII-representable
+ * characters have the same representation as in ASCII itself, and any non-ASCII
+ * character is represented as a sequence of one or more bytes not already used
+ * by any ASCII character. */
 typedef char mbchar;
 
 /* A pointer to 'utf8char' indicates a UTF-8 encoded string */
@@ -172,7 +173,15 @@ wimlib_warning_with_errno(const char *format, ...) FORMAT(printf, 1, 2) COLD;
 #  define WARNING_WITH_ERRNO(format, ...)      dummy_printf(format, ## __VA_ARGS__)
 #endif /* !ENABLE_ERROR_MESSAGES */
 
-#if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG)
+#if defined(ENABLE_MORE_DEBUG) && !defined(ENABLE_DEBUG)
+#  define ENABLE_DEBUG 1
+#endif
+
+#if defined(ENABLE_MORE_ASSERTIONS) && !defined(ENABLE_ASSERTIONS)
+#  define ENABLE_ASSERTIONS 1
+#endif
+
+#ifdef ENABLE_DEBUG
 extern void
 wimlib_debug(const char *file, int line, const char *func,
             const char *format, ...);
@@ -181,26 +190,26 @@ wimlib_debug(const char *file, int line, const char *func,
 
 #else
 #  define DEBUG(format, ...) dummy_printf(format, ## __VA_ARGS__)
-#endif /* ENABLE_DEBUG || ENABLE_MORE_DEBUG */
+#endif /* !ENABLE_DEBUG */
 
 #ifdef ENABLE_MORE_DEBUG
 #  define DEBUG2(format, ...) DEBUG(format, ## __VA_ARGS__)
 #else
 #  define DEBUG2(format, ...) dummy_printf(format, ## __VA_ARGS__)
-#endif /* ENABLE_DEBUG */
+#endif /* !ENABLE_MORE_DEBUG */
 
 #ifdef ENABLE_ASSERTIONS
 #include <assert.h>
 #  define wimlib_assert(expr) assert(expr)
 #else
 #  define wimlib_assert(expr)
-#endif
+#endif /* !ENABLE_ASSERTIONS */
 
 #ifdef ENABLE_MORE_ASSERTIONS
 #  define wimlib_assert2(expr) wimlib_assert(expr)
 #else
 #  define wimlib_assert2(expr)
-#endif
+#endif /* !ENABLE_MORE_ASSERTIONS */
 
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))