Prepare fix for datatypes, not final

[hashcat.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index f9ae5e9..23d8c32 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -45,7 +45,7 @@
 #include <sys/ioctl.h>
 #endif
 
-typedef void     *HM_LIB;
+typedef void *HM_LIB;
 #endif
 
 #ifdef _WIN
@@ -76,6 +76,13 @@ typedef HINSTANCE HM_LIB;
 
 #endif
 
+typedef uint8_t  u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+typedef uint32_t uint; // we need to get rid of this sooner or later, for consistency
+
 #define SPEED_CACHE  128
 #define SPEED_MAXAGE 4096
 
@@ -94,7 +101,7 @@ void log_out (FILE *fp, const char *fmt, ...);
 void log_info (const char *fmt, ...);
 void log_error (const char *fmt, ...);
 
-typedef uint32_t uint; // we should rename to u32, sooner or later, for consistency
-typedef uint64_t u64;
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
 
 #endif