Fix sequential extraction, and include progress info

[wimlib] / src / util.h

diff --git a/src/util.h b/src/util.h
index d87a0e827d16e5c2d80629c84b8af4e5ef3b3769..dd564f5d6af1809d36f2f4e9df41e6f35fb67e56 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -76,6 +76,12 @@ typedef unsigned uint;
        (type *)( (char *)__mptr - offsetof(type,member) );})
 #endif
 
+#define DIV_ROUND_UP(numerator, denominator) \
+       (((numerator) + (denominator) - 1) / (denominator))
+
+#define MODULO_NONZERO(numerator, denominator) \
+       (((numerator) % (denominator)) ? ((numerator) % (denominator)) : (denominator))
+
 #define ARRAY_LEN(array) (sizeof(array) / sizeof((array)[0]))
 
 #define ZERO_ARRAY(array) memset(array, 0, sizeof(array))