Fix sequential extraction, and include progress info

[wimlib] / src / util.h

diff --git a/src/util.h b/src/util.h
index 08a661b8d34572de7e02a37a28406f6335921d24..dd564f5d6af1809d36f2f4e9df41e6f35fb67e56 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -30,6 +30,8 @@
 #      define HOT
 #endif /* __GNUC__ */
 
+
+#if 0
 #ifdef WITH_FUSE
 #define atomic_inc(ptr) \
        __sync_fetch_and_add(ptr, 1)
@@ -37,6 +39,7 @@
 #define atomic_dec(ptr) \
        __sync_sub_and_fetch(ptr, 1)
 #endif
+#endif
 
 #ifndef _NTFS_TYPES_H
 typedef uint8_t  u8;
@@ -73,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))